Skip to content

Commit c7df6b8

Browse files
JakeWhartonJakeWharton
committed
Next version is 2.6.0
Also fix some Javadoc errors and ensure Javadoc (and source) jar generation is tested on CI.
1 parent faa62a8 commit c7df6b8

File tree

23 files changed

+30
-26
lines changed

23 files changed

+30
-26
lines changed

‎.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ language: java
33
jdk:
44
- oraclejdk8
55

6+
# Ensure Javadoc and source jar generation is exercised.
7+
install: mvn install javadoc:jar source:jar -DskipTests=true -B -V
8+
script: mvn test -B
9+
610
after_success:
711
- .buildscript/deploy_snapshot.sh
812

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<groupId>com.squareup.retrofit2</groupId>
2727
<artifactId>parent</artifactId>
28-
<version>2.5.1-SNAPSHOT</version>
28+
<version>2.6.0-SNAPSHOT</version>
2929
<packaging>pom</packaging>
3030

3131
<name>Retrofit (Parent)</name>

‎retrofit-adapters/guava/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-adapters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-adapters/java8/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-adapters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-adapters/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-adapters/rxjava/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-adapters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-adapters/rxjava2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-adapters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-adapters/scala/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-adapters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/gson/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/guava/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/jackson/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/java8/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/jaxb/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/moshi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/protobuf/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/scalars/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/simplexml/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>retrofit-converters</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit-converters/wire/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.squareup.retrofit2</groupId>
1212
<artifactId>retrofit-converters</artifactId>
13-
<version>2.5.1-SNAPSHOT</version>
13+
<version>2.6.0-SNAPSHOT</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎retrofit-mock/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

‎retrofit/src/main/java/retrofit2/SkipCallbackExecutor.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
* {@link Callback#onResponse(Call, Response) onResponse} or
3131
* {@link Callback#onFailure(Call, Throwable) onFailure} methods.
3232
*
33-
* <pre>{@code
34-
* @SkipCallbackExecutor
35-
* @Get("user/{id}/token")
36-
* Call<String> getToken(@Path("id") long id);
37-
* }</pre>
33+
* <pre><code>
34+
* &#64;SkipCallbackExecutor
35+
* &#64;GET("user/{id}/token")
36+
* Call&lt;String&gt; getToken(@Path("id") long id);
37+
* </code></pre>
3838
*
3939
* This annotation can also be used when a {@link CallAdapter.Factory} <em>explicitly</em> delegates
4040
* to the built-in factory for {@link Call} via

‎samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.squareup.retrofit2</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.5.1-SNAPSHOT</version>
9+
<version>2.6.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

0 commit comments

Comments
 (0)