From 6be2c06ed395f3c014c90e35079c25b59746e5d0 Mon Sep 17 00:00:00 2001 From: who Date: Thu, 30 Apr 2015 10:34:43 -0700 Subject: [PATCH] Adding maven publish functionality for android client --- .../src/main/resources/android-java/build.mustache | 4 ++-- samples/client/petstore/android-java/build.gradle | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/android-java/build.mustache b/modules/swagger-codegen/src/main/resources/android-java/build.mustache index 1e0b3773488..ee38aa210b4 100644 --- a/modules/swagger-codegen/src/main/resources/android-java/build.mustache +++ b/modules/swagger-codegen/src/main/resources/android-java/build.mustache @@ -50,7 +50,7 @@ android { ext { swagger_annotations_version = "1.5.3-M1" jackson_version = "2.5.2" - httpclient_android_version = "4.3.5.1" + httpclient_version = "4.4.1" httpcore_version = "4.4.1" httpmime_version = "4.4.1" junit_version = "4.8.1" @@ -61,7 +61,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "org.apache.httpcomponents:httpclient-android:$httpclient_android_version" + compile "org.apache.httpcomponents:httpclient:$httpclient_version" compile ("org.apache.httpcomponents:httpcore:$httpcore_version") { exclude(group: 'org.apache.httpcomponents', module: 'httpclient') } diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle index 8a74e0c8fa1..72494590b7e 100644 --- a/samples/client/petstore/android-java/build.gradle +++ b/samples/client/petstore/android-java/build.gradle @@ -20,7 +20,6 @@ allprojects { } - apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' @@ -42,13 +41,12 @@ android { } } } - } ext { swagger_annotations_version = "1.5.3-M1" jackson_version = "2.5.2" - httpclient_android_version = "4.3.5.1" + httpclient_version = "4.4.1" httpcore_version = "4.4.1" httpmime_version = "4.4.1" junit_version = "4.8.1" @@ -59,7 +57,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-core:$jackson_version" compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version" - compile "org.apache.httpcomponents:httpclient-android:$httpclient_android_version" + compile "org.apache.httpcomponents:httpclient:$httpclient_version" compile ("org.apache.httpcomponents:httpcore:$httpcore_version") { exclude(group: 'org.apache.httpcomponents', module: 'httpclient') }