fix build.gradle template for retrofit2

This commit is contained in:
David Hontecillas 2016-02-26 13:34:57 +01:00
parent 6788c89816
commit 0fe8f7e375
7 changed files with 30 additions and 40 deletions

View File

@ -90,7 +90,6 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
okhttp_version = "3.0.1"
oltu_version = "1.0.0" oltu_version = "1.0.0"
retrofit_version = "2.0.0-beta4" retrofit_version = "2.0.0-beta4"
gson_version = "2.4" gson_version = "2.4"
@ -103,8 +102,6 @@ ext {
} }
dependencies { dependencies {
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:retrofit:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
{{#useRxJava}} {{#useRxJava}}

View File

@ -90,9 +90,8 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
okhttp_version = "3.0.1"
oltu_version = "1.0.0" oltu_version = "1.0.0"
retrofit_version = "2.0.0-beta3" retrofit_version = "2.0.0-beta4"
gson_version = "2.4" gson_version = "2.4"
swagger_annotations_version = "1.5.0" swagger_annotations_version = "1.5.0"
junit_version = "4.12" junit_version = "4.12"
@ -100,13 +99,10 @@ ext {
} }
dependencies { dependencies {
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:retrofit:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "com.google.code.gson:gson:$gson_version"
compile "io.swagger:swagger-annotations:$swagger_annotations_version" compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version" compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"

View File

@ -1,6 +1,6 @@
package io.swagger.client; package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-25T16:20:24.158+01:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-26T13:30:07.836+01:00")
public class StringUtil { public class StringUtil {
/** /**
* Check if the given array contains the given value (with case-insensitive comparison). * Check if the given array contains the given value (with case-insensitive comparison).

View File

@ -90,7 +90,6 @@ if(hasProperty('target') && target == 'android') {
} }
ext { ext {
okhttp_version = "3.0.1"
oltu_version = "1.0.0" oltu_version = "1.0.0"
retrofit_version = "2.0.0-beta4" retrofit_version = "2.0.0-beta4"
gson_version = "2.4" gson_version = "2.4"
@ -101,8 +100,6 @@ ext {
} }
dependencies { dependencies {
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
compile "com.squareup.retrofit2:retrofit:$retrofit_version" compile "com.squareup.retrofit2:retrofit:$retrofit_version"
compile "com.squareup.retrofit2:converter-gson:$retrofit_version" compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version" compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"

View File

@ -1,6 +1,6 @@
package io.swagger.client; package io.swagger.client;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-25T16:58:59.076+01:00") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-26T13:30:13.630+01:00")
public class StringUtil { public class StringUtil {
/** /**
* Check if the given array contains the given value (with case-insensitive comparison). * Check if the given array contains the given value (with case-insensitive comparison).