update retrofit2 dep (#5820)

This commit is contained in:
wing328
2017-06-11 16:12:04 +08:00
committed by GitHub
parent 4bbd9b29a2
commit 2d385d8bcb
39 changed files with 140 additions and 113 deletions

View File

@@ -2,9 +2,15 @@ package {{package}};
import {{invokerPackage}}.CollectionFormats.*;
{{#useRxJava}}import rx.Observable;{{/useRxJava}}
{{#useRxJava2}}import io.reactivex.Observable;{{/useRxJava2}}
{{#doNotUseRx}}import retrofit2.Call;{{/doNotUseRx}}
{{#useRxJava}}
import rx.Observable;
{{/useRxJava}}
{{#useRxJava2}}
import io.reactivex.Observable;
{{/useRxJava2}}
{{#doNotUseRx}}
import retrofit2.Call;
{{/doNotUseRx}}
import retrofit2.http.*;
import okhttp3.RequestBody;

View File

@@ -25,7 +25,8 @@ public class {{classname}}Test {
api = new ApiClient().createService({{classname}}.class);
}
{{#operations}}{{#operation}}
{{#operations}}
{{#operation}}
/**
* {{summary}}
*
@@ -40,5 +41,6 @@ public class {{classname}}Test {
// TODO: test validations
}
{{/operation}}{{/operations}}
{{/operation}}
{{/operations}}
}

View File

@@ -102,26 +102,26 @@ if(hasProperty('target') && target == 'android') {
ext {
oltu_version = "1.0.1"
{{^usePlay24WS}}
retrofit_version = "2.2.0"
retrofit_version = "2.3.0"
{{/usePlay24WS}}
{{#usePlay24WS}}
retrofit_version = "2.1.0"
jackson_version = "2.7.5"
play_version = "2.4.11"
{{/usePlay24WS}}
swagger_annotations_version = "1.5.12"
swagger_annotations_version = "1.5.13"
junit_version = "4.12"
{{#useRxJava}}
rx_java_version = "1.2.9"
rx_java_version = "1.3.0"
{{/useRxJava}}
{{#useRxJava2}}
rx_java_version = "2.0.7"
rx_java_version = "2.1.0"
{{/useRxJava2}}
{{#joda}}
jodatime_version = "2.9.4"
jodatime_version = "2.9.9"
{{/joda}}
{{#threetenbp}}
threetenbp_version = "1.3.2"
threetenbp_version = "1.3.5"
{{/threetenbp}}
}
@@ -140,10 +140,10 @@ dependencies {
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
{{#joda}}
compile 'joda-time:joda-time:$jodatime_version'
compile "joda-time:joda-time:$jodatime_version"
{{/joda}}
{{#threetenbp}}
compile 'org.threeten:threetenbp:$threetenbp_version'
compile "org.threeten:threetenbp:$threetenbp_version"
{{/threetenbp}}
{{#usePlay24WS}}
compile "com.typesafe.play:play-java-ws_2.11:$play_version"

View File

@@ -10,7 +10,7 @@ lazy val root = (project in file(".")).
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
{{^usePlay24WS}}
"com.squareup.retrofit2" % "retrofit" % "2.2.0" % "compile",
"com.squareup.retrofit2" % "retrofit" % "2.3.0" % "compile",
"com.squareup.retrofit2" % "converter-scalars" % "2.2.0" % "compile",
"com.squareup.retrofit2" % "converter-gson" % "2.2.0" % "compile",
{{/usePlay24WS}}
@@ -25,20 +25,20 @@ lazy val root = (project in file(".")).
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
{{/usePlay24WS}}
{{#useRxJava}}
"com.squareup.retrofit2" % "adapter-rxjava" % "{{^usePlay24WS}}2.2.0{{/usePlay24WS}}{{#usePlay24WS}}2.1.0{{/usePlay24WS}}" % "compile",
"io.reactivex" % "rxjava" % "1.2.9" % "compile",
"com.squareup.retrofit2" % "adapter-rxjava" % "{{^usePlay24WS}}2.3.0{{/usePlay24WS}}{{#usePlay24WS}}2.1.0{{/usePlay24WS}}" % "compile",
"io.reactivex" % "rxjava" % "1.3.0" % "compile",
{{/useRxJava}}
{{#useRxJava2}}
"com.jakewharton.retrofit" % "retrofit2-rxjava2-adapter" % "1.0.0" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.0.7" % "compile",
"io.reactivex.rxjava2" % "rxjava" % "2.1.0" % "compile",
{{/useRxJava2}}
"io.swagger" % "swagger-annotations" % "1.5.12" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
{{#joda}}
"joda-time" % "joda-time" % "2.9.4" % "compile",
"joda-time" % "joda-time" % "2.9.9" % "compile",
{{/joda}}
{{#threetenbp}}
"org.threeten" % "threetenbp" % "1.3.2" % "compile",
"org.threeten" % "threetenbp" % "1.3.5" % "compile",
{{/threetenbp}}
"junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.11" % "test"

View File

@@ -280,23 +280,23 @@
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.12</swagger-core-version>
<swagger-core-version>1.5.13</swagger-core-version>
{{#usePlay24WS}}
<jackson-version>2.7.5</jackson-version>
<play-version>2.4.11</play-version>
{{/usePlay24WS}}
<retrofit-version>2.2.0</retrofit-version>
<retrofit-version>2.3.0</retrofit-version>
{{#useRxJava}}
<rxjava-version>1.2.9</rxjava-version>
<rxjava-version>1.3.0</rxjava-version>
{{/useRxJava}}
{{#useRxJava2}}
<rxjava-version>2.0.7</rxjava-version>
<rxjava-version>2.1.0</rxjava-version>
{{/useRxJava2}}
{{#joda}}
<jodatime-version>2.9.3</jodatime-version>
<jodatime-version>2.9.9</jodatime-version>
{{/joda}}
{{#threetenbp}}
<threetenbp-version>1.3.2</threetenbp-version>
<threetenbp-version>1.3.5</threetenbp-version>
{{/threetenbp}}
<oltu-version>1.0.1</oltu-version>
<junit-version>4.12</junit-version>