From 8b96cdb7d7a8599c28daeb42125a13d6a3be047b Mon Sep 17 00:00:00 2001
From: xhh <xhh@xhh.me>
Date: Mon, 7 Sep 2015 16:35:34 +0800
Subject: [PATCH] Set source/target compatibility in Android client

---
 .../Java/libraries/okhttp-gson/build.gradle.mustache        | 4 ++--
 .../src/main/resources/android-java/build.mustache          | 6 +++++-
 samples/client/petstore/android-java/build.gradle           | 4 ++++
 samples/client/petstore/java/okhttp-gson/build.gradle       | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index 73ea697ac139..02e1caa673af 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -1,8 +1,8 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
 
 repositories {
     mavenCentral()
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 367890f3298c..dff18970462b 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/build.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/build.mustache
@@ -34,6 +34,10 @@ android {
         minSdkVersion 14
         targetSdkVersion 22
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 
     // Rename the aar correctly
     libraryVariants.all { variant ->
@@ -90,4 +94,4 @@ task sourcesJar(type: Jar) {
 artifacts {
     archives sourcesJar
 }
-{{/useAndroidMavenGradlePlugin}}
\ No newline at end of file
+{{/useAndroidMavenGradlePlugin}}
diff --git a/samples/client/petstore/android-java/build.gradle b/samples/client/petstore/android-java/build.gradle
index 028b56beae61..417503cb51ea 100644
--- a/samples/client/petstore/android-java/build.gradle
+++ b/samples/client/petstore/android-java/build.gradle
@@ -30,6 +30,10 @@ android {
         minSdkVersion 14
         targetSdkVersion 22
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 
     // Rename the aar correctly
     libraryVariants.all { variant ->
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index 53e92e5fe169..ada6a992573a 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
 
 repositories {
     mavenCentral()