diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
index e97cd02c523..af091afbe07 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
@@ -50,7 +50,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
additionalProperties.put("artifactId", artifactId);
additionalProperties.put("artifactVersion", artifactVersion);
- supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+ supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
supportingFiles.add(new SupportingFile("apiInvoker.mustache",
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
supportingFiles.add(new SupportingFile("httpPatch.mustache",
diff --git a/modules/swagger-codegen/src/main/resources/android-java/build.mustache b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
new file mode 100644
index 00000000000..f58655627e6
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
@@ -0,0 +1,48 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 22
+ buildToolsVersion "22.0.0"
+
+ defaultConfig {
+ applicationId "{{invokerPackage}}"
+ minSdkVersion 14
+ targetSdkVersion 22
+ versionCode 1
+ versionName "{{artifactVersion}}"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ packagingOptions {
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/notice.txt'
+ exclude 'META-INF/license.txt'
+ exclude 'META-INF/ASL2.0'
+ exclude 'META-INF/services/com.fasterxml.jackson.core.JsonFactory'
+ exclude 'META-INF/services/com.fasterxml.jackson.core.ObjectCodec'
+ }
+}
+
+ext {
+ swagger_annotations_version = '1.5.3-M1'
+ jackson_version = '2.5.2'
+ apache_httpclient_version = '4.3.5.1'
+ apache_httpmime_version = '4.4.1'
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support:appcompat-v7:22.0.0'
+ compile "com.wordnik:swagger-annotations:$swagger_annotations_version"
+ 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:$apache_httpclient_version"
+ compile "org.apache.httpcomponents:httpmime:$apache_httpmime_version"
+}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache b/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
deleted file mode 100644
index 8a01631edb0..00000000000
--- a/modules/swagger-codegen/src/main/resources/android-java/pom.mustache
+++ /dev/null
@@ -1,168 +0,0 @@
-
- 4.0.0
- {{groupId}}
- {{artifactId}}
- jar
- {{artifactId}}
- {{artifactVersion}}
-
- scm:git:git@github.com:wordnik/swagger-mustache.git
- scm:git:git@github.com:wordnik/swagger-codegen.git
- https://github.com/wordnik/swagger-codegen
-
-
- 2.2.0
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.12
-
-
-
- loggerPath
- conf/log4j.properties
-
-
- -Xms512m -Xmx1500m
- methods
- pertest
-
-
-
- maven-dependency-plugin
-
-
- package
-
- copy-dependencies
-
-
- ${project.build.directory}/lib
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.2
-
-
-
- jar
- test-jar
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- add_sources
- generate-sources
-
- add-source
-
-
-
- src/main/java
-
-
-
-
- add_test_sources
- generate-test-sources
-
- add-test-source
-
-
-
- src/test/java
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.3.2
-
- 1.6
- 1.6
-
-
-
-
-
-
- com.wordnik
- swagger-annotations
- ${swagger-annotations-version}
-
-
- 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
- ${httpclient-version}
- compile
-
-
- org.apache.httpcomponents
- httpmime
- ${httpclient-version}
- compile
-
-
-
-
- junit
- junit
- ${junit-version}
- test
-
-
-
-
- sonatype-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
-
-
- 1.5.1-M1
- 2.1.4
- 4.8.1
- 1.0.0
- 4.8.1
- 4.3.6
-
-
diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle
new file mode 100644
index 00000000000..96a5b98de9d
--- /dev/null
+++ b/samples/client/petstore/android-java/build.gradle
@@ -0,0 +1,48 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 22
+ buildToolsVersion "22.0.0"
+
+ defaultConfig {
+ applicationId "io.swagger.client"
+ minSdkVersion 14
+ targetSdkVersion 22
+ versionCode 1
+ versionName "1.0.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ packagingOptions {
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/notice.txt'
+ exclude 'META-INF/license.txt'
+ exclude 'META-INF/ASL2.0'
+ exclude 'META-INF/services/com.fasterxml.jackson.core.JsonFactory'
+ exclude 'META-INF/services/com.fasterxml.jackson.core.ObjectCodec'
+ }
+}
+
+ext {
+ swagger_annotations_version = '1.5.3-M1'
+ jackson_version = '2.5.2'
+ apache_httpclient_version = '4.3.5.1'
+ apache_httpmime_version = '4.4.1'
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support:appcompat-v7:22.0.0'
+ compile "com.wordnik:swagger-annotations:$swagger_annotations_version"
+ 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:$apache_httpclient_version"
+ compile "org.apache.httpcomponents:httpmime:$apache_httpmime_version"
+}
\ No newline at end of file
diff --git a/samples/client/petstore/android-java/pom.xml b/samples/client/petstore/android-java/pom.xml
deleted file mode 100644
index 7fbeb5245bd..00000000000
--- a/samples/client/petstore/android-java/pom.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-
- 4.0.0
- io.swagger
- swagger-android-client
- jar
- swagger-android-client
- 1.0.0
-
- scm:git:git@github.com:wordnik/swagger-mustache.git
- scm:git:git@github.com:wordnik/swagger-codegen.git
- https://github.com/wordnik/swagger-codegen
-
-
- 2.2.0
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.12
-
-
-
- loggerPath
- conf/log4j.properties
-
-
- -Xms512m -Xmx1500m
- methods
- pertest
-
-
-
- maven-dependency-plugin
-
-
- package
-
- copy-dependencies
-
-
- ${project.build.directory}/lib
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.2
-
-
-
- jar
- test-jar
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- add_sources
- generate-sources
-
- add-source
-
-
-
- src/main/java
-
-
-
-
- add_test_sources
- generate-test-sources
-
- add-test-source
-
-
-
- src/test/java
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.3.2
-
- 1.6
- 1.6
-
-
-
-
-
-
- com.wordnik
- swagger-annotations
- ${swagger-annotations-version}
-
-
- 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
- ${httpclient-version}
- compile
-
-
- org.apache.httpcomponents
- httpmime
- ${httpclient-version}
- compile
-
-
-
-
- junit
- junit
- ${junit-version}
- test
-
-
-
-
- sonatype-snapshots
- https://oss.sonatype.org/content/repositories/snapshots
-
-
-
- 1.5.1-M1
- 2.1.4
- 4.8.1
- 1.0.0
- 4.8.1
- 4.3.6
-
-