Merge pull request #2453 from wing328/bug/fix_2451

wing328 · wing328 · commit 981d2f14755b · 2016-03-28T23:53:02.000+08:00
[Android] update build.gradle for android (default, volley)
diff --git a/modules/swagger-codegen/src/main/resources/android/build.mustache b/modules/swagger-codegen/src/main/resources/android/build.mustache
@@ -8,9 +8,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
         {{#useAndroidMavenGradlePlugin}}
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         {{/useAndroidMavenGradlePlugin}}
     }
 }
@@ -28,11 +28,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 {{/useAndroidMavenGradlePlugin}}
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+    useLibrary  'org.apache.http.legacy'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -55,16 +56,17 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
-    junit_version = "4.8.1"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
+    junit_version = "4.12"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
-    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpcore:$httpcore_version"
     compile "org.apache.httpcomponents:httpclient:$httpclient_version"
-    compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
+    compile ("org.apache.httpcomponents:httpcore:$httpcore_version") {
         exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
     }
     compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/apiInvoker.mustache
@@ -197,7 +197,8 @@ public class ApiInvoker {
      INSTANCE.authentications.put("{{name}}", new HttpBasicAuth());
      {{/isBasic}}
      {{#isOAuth}}
-     INSTANCE.authentications.put("{{name}}", new OAuth());
+     // TODO: comment out below as OAuth does not exist
+     //INSTANCE.authentications.put("{{name}}", new OAuth());
      {{/isOAuth}}
      {{/authMethods}}
      // Prevent the authentications from being modified.
diff --git a/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache b/modules/swagger-codegen/src/main/resources/android/libraries/volley/build.mustache
@@ -8,9 +8,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
         {{#useAndroidMavenGradlePlugin}}
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         {{/useAndroidMavenGradlePlugin}}
     }
 }
@@ -59,9 +59,10 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
     volley_version = "1.0.19"
-    junit_version = "4.8.1"
+    junit_version = "4.12"
     robolectric_version = "3.0"
     concurrent_unit_version = "0.4.2"
 }
diff --git a/samples/client/petstore/android/default/build.gradle b/samples/client/petstore/android/default/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.+'
         
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         
     }
 }
@@ -24,11 +24,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.0'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
+    useLibrary  'org.apache.http.legacy'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -51,16 +52,17 @@ android {
 ext {
     swagger_annotations_version = "1.5.0"
     gson_version = "2.3.1"
-    httpclient_version = "4.3.3"
-    junit_version = "4.8.1"
+    httpclient_version = "4.5.2"
+    httpcore_version = "4.4.4"
+    junit_version = "4.12"
 }
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "com.google.code.gson:gson:$gson_version"
-    compile "org.apache.httpcomponents:httpcore:$httpclient_version"
+    compile "org.apache.httpcomponents:httpcore:$httpcore_version"
     compile "org.apache.httpcomponents:httpclient:$httpclient_version"
-    compile ("org.apache.httpcomponents:httpcore:$httpclient_version") {
+    compile ("org.apache.httpcomponents:httpcore:$httpcore_version") {
         exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
     }
     compile ("org.apache.httpcomponents:httpmime:$httpclient_version") {
diff --git a/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/default/src/main/java/io/swagger/client/model/Name.java
@@ -10,6 +10,8 @@ public class Name  {
   
   @SerializedName("name")
   private Integer name = null;
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
 
   
   /**
@@ -23,13 +25,25 @@ public void setName(Integer name) {
   }
 
   
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
 
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Name {\n");
     
     sb.append("  name: ").append(name).append("\n");
+    sb.append("  snakeCase: ").append(snakeCase).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle
@@ -6,9 +6,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         
     }
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/ApiInvoker.java
@@ -229,7 +229,8 @@ public static void initializeInstance(Cache cache, Network network, int threadPo
      
      
      
-     INSTANCE.authentications.put("petstore_auth", new OAuth());
+     // TODO: comment out below as OAuth does not exist
+     //INSTANCE.authentications.put("petstore_auth", new OAuth());
      
      
      // Prevent the authentications from being modified.
diff --git a/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/android/volley/src/main/java/io/swagger/client/model/Name.java
@@ -10,6 +10,8 @@ public class Name  {
   
   @SerializedName("name")
   private Integer name = null;
+  @SerializedName("snake_case")
+  private Integer snakeCase = null;
 
   
   /**
@@ -23,13 +25,25 @@ public void setName(Integer name) {
   }
 
   
+  /**
+   **/
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+  public void setSnakeCase(Integer snakeCase) {
+    this.snakeCase = snakeCase;
+  }
+
+  
 
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Name {\n");
     
     sb.append("  name: ").append(name).append("\n");
+    sb.append("  snakeCase: ").append(snakeCase).append("\n");
     sb.append("}\n");
     return sb.toString();
   }

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ buildscript {`
`8`	`8`	`jcenter()`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:1.2.2'`
	`11`	`+ classpath 'com.android.tools.build:gradle:1.5.+'`
`12`	`12`	`{{#useAndroidMavenGradlePlugin}}`
`13`		`- classpath 'com.github.dcendents:android-maven-plugin:1.2'`
	`13`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'`
`14`	`14`	`{{/useAndroidMavenGradlePlugin}}`
`15`	`15`	`}`
`16`	`16`	`}`
`@@ -59,9 +59,10 @@ android {`
`59`	`59`	`ext {`
`60`	`60`	`swagger_annotations_version = "1.5.0"`
`61`	`61`	`gson_version = "2.3.1"`
`62`		`- httpclient_version = "4.3.3"`
	`62`	`+ httpclient_version = "4.5.2"`
	`63`	`+ httpcore_version = "4.4.4"`
`63`	`64`	`volley_version = "1.0.19"`
`64`		`- junit_version = "4.8.1"`
	`65`	`+ junit_version = "4.12"`
`65`	`66`	`robolectric_version = "3.0"`
`66`	`67`	`concurrent_unit_version = "0.4.2"`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:1.2.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:1.5.0'`
`10`	`10`
`11`		`- classpath 'com.github.dcendents:android-maven-plugin:1.2'`
	`11`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'`
`12`	`12`
`13`	`13`	`}`
`14`	`14`	`}`