Adding maven publish functionality for android client

who · who · commit 6be2c06ed395 · 2015-04-30T10:34:43.000-07:00
diff --git 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
@@ -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')
     }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ allprojects {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`
`23`		`-`
`24`	`23`	`apply plugin: 'com.android.library'`
`25`	`24`	`apply plugin: 'com.github.dcendents.android-maven'`
`26`	`25`
`@@ -42,13 +41,12 @@ android {`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`	`}`
`45`		`-`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`ext {`
`49`	`47`	`swagger_annotations_version = "1.5.3-M1"`
`50`	`48`	`jackson_version = "2.5.2"`
`51`		`- httpclient_android_version = "4.3.5.1"`
	`49`	`+ httpclient_version = "4.4.1"`
`52`	`50`	`httpcore_version = "4.4.1"`
`53`	`51`	`httpmime_version = "4.4.1"`
`54`	`52`	`junit_version = "4.8.1"`
`@@ -59,7 +57,7 @@ dependencies {`
`59`	`57`	`compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"`
`60`	`58`	`compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"`
`61`	`59`	`compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"`
`62`		`- compile "org.apache.httpcomponents:httpclient-android:$httpclient_android_version"`
	`60`	`+ compile "org.apache.httpcomponents:httpclient:$httpclient_version"`
`63`	`61`	`compile ("org.apache.httpcomponents:httpcore:$httpcore_version") {`
`64`	`62`	`exclude(group: 'org.apache.httpcomponents', module: 'httpclient')`
`65`	`63`	`}`