Skip to content

Commit 8fea6f1

Browse files
committed
Bump to 2.0.2
1 parent 194f48b commit 8fea6f1

File tree

12 files changed

+145
-86
lines changed

12 files changed

+145
-86
lines changed

README.md

+15-5
Original file line numberDiff line numberDiff line change
@@ -598,12 +598,14 @@ repositories {
598598
}
599599

600600
dependencies {
601-
compile 'com.infstory:retrofit:2.0.0'
602-
apt 'com.infstory:retrofit-processor:2.0.0'
601+
compile 'com.infstory:retrofit:2.0.2'
602+
apt 'com.infstory:retrofit-processor:2.0.2'
603+
compile 'com.bluelinelabs:logansquare:1.1.0'
604+
apt 'com.bluelinelabs:logansquare-compiler:1.1.0'
603605
}
604606
```
605607

606-
or via jitpack (in progress):
608+
or via jitpack:
607609

608610
```java
609611
repositories {
@@ -612,11 +614,19 @@ repositories {
612614
}
613615

614616
dependencies {
615-
compile 'com.github.yongjhih.retrofit:retrofit:-SNAPSHOT'
616-
apt 'com.github.yongjhih.retrofit:retrofit-processor:-SNAPSHOT'
617+
compile 'com.github.yongjhih.NotRetrofit:retrofit:-SNAPSHOT'
618+
apt 'com.github.yongjhih.NotRetrofit:retrofit-processor:-SNAPSHOT'
619+
compile 'com.bluelinelabs:logansquare:1.1.0'
620+
apt 'com.bluelinelabs:logansquare-compiler:1.1.0'
617621
}
618622
```
619623

624+
## Deploy
625+
626+
```bash
627+
./gradlew bintrayUpload
628+
```
629+
620630
## Live Demo
621631

622632
* https://appetize.io/app/3trwbht63k0rkfmbxbt51h84cr

build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
allprojects {
3-
group = GROUP
4-
version = VERSION_NAME
5-
}

gradle.properties

-4
This file was deleted.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// build a jar with source files
2+
task sourcesJar(type: Jar) {
3+
from android.sourceSets.main.java.srcDirs
4+
classifier = 'sources'
5+
}
6+
7+
task javadoc(type: Javadoc) {
8+
failOnError false
9+
source = android.sourceSets.main.java.sourceFiles
10+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
11+
}
12+
13+
// build a jar with javadoc
14+
task javadocJar(type: Jar, dependsOn: javadoc) {
15+
classifier = 'javadoc'
16+
from javadoc.destinationDir
17+
}
18+
19+
artifacts {
20+
archives sourcesJar
21+
archives javadocJar
22+
}

retrofit-android/build.gradle

+29-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
ext.artifactId = 'retrofit-android'
2-
31
buildscript {
42
repositories {
53
jcenter()
64
}
75
dependencies {
86
classpath 'com.android.tools.build:gradle:1.2.3'
7+
classpath 'com.novoda:bintray-release:0.3.4'
8+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
99
}
1010
}
1111

@@ -15,7 +15,6 @@ repositories {
1515
}
1616

1717
apply plugin: 'com.android.library'
18-
apply from: 'deploy.gradle'
1918

2019
android {
2120
compileSdkVersion 22
@@ -48,3 +47,30 @@ tasks.withType(Test) {
4847
showStandardStreams = true
4948
}
5049
}
50+
51+
apply plugin: 'com.github.dcendents.android-maven'
52+
apply from: 'android-javadoc.gradle'
53+
group = 'com.github.yongjhih'
54+
55+
apply plugin: 'com.novoda.bintray-release'
56+
57+
def getRepositoryUsername() {
58+
return hasProperty('BINTRAY_USER') ? BINTRAY_USER : ""
59+
}
60+
61+
def getRepositoryPassword() {
62+
return hasProperty('BINTRAY_KEY') ? BINTRAY_KEY : ""
63+
}
64+
65+
publish {
66+
userOrg = 'yongjhih'
67+
groupId = 'com.infstory'
68+
artifactId = 'retrofit-processor'
69+
//uploadName = ''
70+
publishVersion = '2.0.2'
71+
desc = 'Type-safe REST client for Android and Java'
72+
website = 'https://github.com/yongjhih/NotRetrofit'
73+
bintrayUser = getRepositoryUsername()
74+
bintrayKey = getRepositoryPassword()
75+
dryRun = false
76+
}

retrofit-android/gradle.properties

-21
This file was deleted.

retrofit-processor/build.gradle

+37-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
1-
ext.artifactId = 'retrofit-processor'
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
}
5+
6+
dependencies {
7+
classpath 'com.novoda:bintray-release:0.3.4'
8+
}
9+
}
210

311
apply plugin: 'java'
4-
apply from: 'deploy.gradle'
512

613
targetCompatibility = '1.6'
714
sourceCompatibility = '1.6'
@@ -33,6 +40,33 @@ dependencies {
3340
tasks.withType(Test) {
3441
testLogging {
3542
exceptionFormat "full"
36-
events "passed", "skipped", "failed"
43+
events "passed", "skipped", "failed", "standardOut", "standardError"
44+
showStandardStreams = true
3745
}
3846
}
47+
48+
apply plugin: 'maven'
49+
group = 'com.github.yongjhih'
50+
51+
apply plugin: 'com.novoda.bintray-release'
52+
53+
def getRepositoryUsername() {
54+
return hasProperty('BINTRAY_USER') ? BINTRAY_USER : ""
55+
}
56+
57+
def getRepositoryPassword() {
58+
return hasProperty('BINTRAY_KEY') ? BINTRAY_KEY : ""
59+
}
60+
61+
publish {
62+
userOrg = 'yongjhih'
63+
groupId = 'com.infstory'
64+
artifactId = 'retrofit-android'
65+
//uploadName = ''
66+
publishVersion = '2.0.2'
67+
desc = 'Type-safe REST client for Android and Java'
68+
website = 'https://github.com/yongjhih/NotRetrofit'
69+
bintrayUser = getRepositoryUsername()
70+
bintrayKey = getRepositoryPassword()
71+
dryRun = false
72+
}

retrofit-processor/gradle.properties

-21
This file was deleted.

retrofit/build.gradle

+36-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
ext.artifactId = 'retrofit'
1+
buildscript {
2+
repositories {
3+
jcenter()
4+
}
5+
dependencies {
6+
classpath 'com.novoda:bintray-release:0.3.4'
7+
}
8+
}
29

310
apply plugin: 'java'
4-
apply from: 'deploy.gradle'
511

612
targetCompatibility = '1.6'
713
sourceCompatibility = '1.6'
@@ -22,6 +28,33 @@ dependencies {
2228
tasks.withType(Test) {
2329
testLogging {
2430
exceptionFormat "full"
25-
events "passed", "skipped", "failed"
31+
events "passed", "skipped", "failed", "standardOut", "standardError"
32+
showStandardStreams = true
2633
}
2734
}
35+
36+
apply plugin: 'maven'
37+
group = 'com.github.yongjhih'
38+
39+
apply plugin: 'com.novoda.bintray-release'
40+
41+
def getRepositoryUsername() {
42+
return hasProperty('BINTRAY_USER') ? BINTRAY_USER : ""
43+
}
44+
45+
def getRepositoryPassword() {
46+
return hasProperty('BINTRAY_KEY') ? BINTRAY_KEY : ""
47+
}
48+
49+
publish {
50+
userOrg = 'yongjhih'
51+
groupId = 'com.infstory'
52+
artifactId = 'retrofit'
53+
//uploadName = ''
54+
publishVersion = '2.0.2'
55+
desc = 'Type-safe REST client for Android and Java'
56+
website = 'https://github.com/yongjhih/NotRetrofit'
57+
bintrayUser = getRepositoryUsername()
58+
bintrayKey = getRepositoryPassword()
59+
dryRun = false
60+
}

retrofit/gradle.properties

-21
This file was deleted.

retrofit2-github-app/build.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ android {
5353
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
5454
}
5555
}
56+
57+
lintOptions {
58+
abortOnError false
59+
}
60+
5661
}
5762

5863
repositories {

0 commit comments

Comments
 (0)