Merge pull request android#101 from proppy/bump-gradle-3

bump gradle android plugin to 0.4.0
buobao · Nov 13, 2015 · c6d9ebc · c6d9ebc
2 parents 1daf421 + 521eaa1
commit c6d9ebc
Show file tree

Hide file tree

Showing 49 changed files with 146 additions and 150 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: android
 sudo: false
 android:
   components:
+    - platform-tools
     - build-tools-23.0.0
     - android-23
     - extra-google-m2repository

diff --git a/MoreTeapots/app/build.gradle b/MoreTeapots/app/build.gradle
@@ -18,15 +18,13 @@ model {
     }
 
     android.ndk {
-        moduleName ="MoreTeapotsNativeActivity"
-        cppFlags   += "-I${file("src/main/jni/cpufeatures")}".toString()
-        cppFlags   += "-I${file("src/main/jni/native_app_glue")}".toString()
-        cppFlags   += "-I${file("src/main/jni/ndk_helper")}".toString()
-
+        moduleName = "MoreTeapotsNativeActivity"
+        cppFlags.addAll(["-I${file("src/main/jni/cpufeatures")}".toString(),
+                         "-I${file("src/main/jni/native_app_glue")}".toString(),
+                         "-I${file("src/main/jni/ndk_helper")}".toString()])
         // CFlags is configured in similiar way as cppFlags
-        // CFlags    += "-I${file("src/main/jni/native_app_glue")}".toString()
-
-        ldLibs     += ["android", "EGL", "GLESv2","log"]
+        // CFlags.add("-I${file("src/main/jni/native_app_glue")}".toString())
+        ldLibs.addAll(["android", "EGL", "GLESv2","log"])
         stl         = "stlport_static"
     }
 
@@ -42,13 +40,13 @@ model {
 
     android.productFlavors {
         create ("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndk.abiFilters.add("armeabi-v7a")
         }
         create ("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndk.abiFilters.add("arm64-v8a")
         }
         create ("x86-32") {
-            ndk.abiFilters += "x86"
+            ndk.abiFilters.add("x86")
         }
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa

diff --git a/MoreTeapots/build.gradle b/MoreTeapots/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
     }
 }
 

diff --git a/MoreTeapots/gradle/wrapper/gradle-wrapper.properties b/MoreTeapots/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/Teapot/app/build.gradle b/Teapot/app/build.gradle
@@ -20,13 +20,12 @@ model {
 
     android.ndk {
         moduleName = "TeapotNativeActivity"
-        cppFlags += "-I${file("src/main/jni/native_app_glue")}".toString()
-        cppFlags += "-I${file("src/main/jni/cpufeatures")}".toString()
-        cppFlags += "-I${file("src/main/jni/ndk_helper")}".toString()
-
+        cppFlags.addAll(["-I${file("src/main/jni/native_app_glue")}".toString(),
+	                 "-I${file("src/main/jni/cpufeatures")}".toString(),
+                         "-I${file("src/main/jni/ndk_helper")}".toString()])
         // CFlags is configured in similar way as cppFlags
-        // CFlags += "-I${file("src/main/jni/native_app_glue")}".toString()
-        ldLibs += ["android", "EGL", "GLESv2", "dl", "log"]
+        // CFlags.add("-I${file("src/main/jni/native_app_glue")}".toString())
+        ldLibs.addAll(["android", "EGL", "GLESv2", "dl", "log"])
         stl     = "stlport_static"
     }
     // jni is the default dir; config this if yours is in different directory
@@ -42,18 +41,18 @@ model {
     android.buildTypes {
         release {
             minifyEnabled = false
-            proguardFiles += file('proguard-rules.txt')
+            proguardFiles.add(file('proguard-rules.txt'))
         }
     }
     android.productFlavors {
         create ("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndk.abiFilters.add("armeabi-v7a")
         }
         create ("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndk.abiFilters.add("arm64-v8a")
         }
         create ("x86-32") {
-            ndk.abiFilters += "x86"
+            ndk.abiFilters.add("x86")
         }
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa

diff --git a/Teapot/build.gradle b/Teapot/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
     }
 }
 

diff --git a/Teapot/gradle/wrapper/gradle-wrapper.properties b/Teapot/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/audio-echo/app/build.gradle b/audio-echo/app/build.gradle
@@ -25,17 +25,14 @@ model {
 
     android.ndk {
         moduleName = "echo"
-        cppFlags  += ["-std=c++11"]
-        ldLibs += ['android', 'log', 'OpenSLES']
+        cppFlags.add("-std=c++11")
+        ldLibs.addAll(['android', 'log', 'OpenSLES'])
         stl     = "gnustl_static"
     }
     android.buildTypes {
         release {
             minifyEnabled=false
-            proguardFiles+=file('proguard-android.txt')
-        }
-        debug {
-            debuggable = true
+            proguardFiles.add(file('proguard-android.txt'))
         }
     }
     android.productFlavors {

diff --git a/audio-echo/build.gradle b/audio-echo/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/audio-echo/gradle/wrapper/gradle-wrapper.properties b/audio-echo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/bitmap-plasma/app/build.gradle b/bitmap-plasma/app/build.gradle
@@ -20,26 +20,24 @@ model {
 
     android.ndk {
         moduleName = "plasma"
-        ldLibs += ["m","log","jnigraphics"]
+        ldLibs.addAll(["m","log","jnigraphics"])
     }
 
     android.buildTypes {
         release {
             minifyEnabled = false
-            proguardFiles += file('proguard-rules.txt')
-
-            println(proguardFiles)
+            proguardFiles.add(file('proguard-rules.txt'))
         }
     }
     android.productFlavors {
         create ("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndk.abiFilters.add("armeabi-v7a")
         }
         create ("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndk.abiFilters.add("arm64-v8a")
         }
         create ("x86-32") {
-            ndk.abiFilters += "x86"
+            ndk.abiFilters.add("x86")
         }
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa

diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
     }
 }
 

diff --git a/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties b/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/endless-tunnel/app/build.gradle b/endless-tunnel/app/build.gradle
@@ -36,10 +36,10 @@ model {
 
     android.ndk {
             moduleName = "game"
-            cppFlags  += "-I${file("src/main/jni/native_app_glue")}".toString()
-            cppFlags  += "-I${file("src/main/jni")}".toString()
-            cppFlags  += "-I${file("src/main/jni/data")}".toString()
-            ldLibs    += ["android", "EGL", "GLESv2", "OpenSLES", "log"]
+            cppFlags.addAll(["-I${file("src/main/jni/native_app_glue")}".toString(),
+                             "-I${file("src/main/jni")}".toString(),
+                             "-I${file("src/main/jni/data")}".toString()])
+            ldLibs.addAll(["android", "EGL", "GLESv2", "OpenSLES", "log"])
             stl        = "stlport_static"
     }
     android.lintOptions {
@@ -54,13 +54,13 @@ model {
 
     android.productFlavors {
         create ("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndk.abiFilters.add("armeabi-v7a")
         }
         create ("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndk.abiFilters.add("arm64-v8a")
         }
         create ("x86-32") {
-            ndk.abiFilters += "x86"
+            ndk.abiFilters.add("x86")
         }
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa

diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
     }
 }
 

diff --git a/endless-tunnel/gradle/wrapper/gradle-wrapper.properties b/endless-tunnel/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/gles3jni/app/build.gradle b/gles3jni/app/build.gradle
@@ -17,29 +17,27 @@ model {
     }    
     android.ndk {
         moduleName  = "gles3jni"
-        cppFlags   += "-Werror"
-        cppFlags   += "-fno-rtti"
-        cppFlags   += "-fno-exceptions"
-        CFlags     += ["-Werror"]
-        ldLibs     += ["log","GLESv3", "EGL"]
+        cppFlags.addAll(["-Werror", "-fno-rtti", "-fno-exceptions"])
+	CFlags.add("-Werror")
+        ldLibs.addAll(["log","GLESv3", "EGL"])
         stl         = "stlport_static"
     }
     android.buildTypes {
         release {
             minifyEnabled = false
-            proguardFiles  += file('proguard-rules.txt')
+            proguardFiles.add(file('proguard-rules.txt'))
         }
     }
 
     android.productFlavors {
         create ("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndk.abiFilters.add("armeabi-v7a")
         }
         create ("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndk.abiFilters.add("arm64-v8a")
         }
         create ("x86-32") {
-            ndk.abiFilters += "x86"
+            ndk.abiFilters.add("x86")
         }
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa

diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
     }
 }
 

diff --git a/gles3jni/gradle/wrapper/gradle-wrapper.properties b/gles3jni/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip
diff --git a/hello-gl2/app/build.gradle b/hello-gl2/app/build.gradle
@@ -19,26 +19,26 @@ model {
 
     android.ndk {
         moduleName = "gl2jni"
-        cppFlags  += "-Werror"
-        ldLibs    += ["log", "GLESv2"]
+        cppFlags.add("-Werror")
+        ldLibs.addAll(["log", "GLESv2"])
     }
 
     android.buildTypes {
         release {
             minifyEnabled = false
-            proguardFiles  += file('proguard-rules.txt')
+            proguardFiles.add(file('proguard-rules.txt'))
         }
     }
 
     android.productFlavors {
         create ("arm7") {
-            ndk.abiFilters += "armeabi-v7a"
+            ndk.abiFilters.add("armeabi-v7a")
         }
         create ("arm8") {
-            ndk.abiFilters += "arm64-v8a"
+            ndk.abiFilters.add("arm64-v8a")
         }
         create ("x86-32") {
-            ndk.abiFilters += "x86"
+            ndk.abiFilters.add("x86")
         }
         // for detailed abiFilter descriptions, refer to "Supported ABIs" @
         // https://developer.android.com/ndk/guides/abis.html#sa

diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle-experimental:0.2.0'
+        classpath 'com.android.tools.build:gradle-experimental:0.4.0'
     }
 }
 

diff --git a/hello-gl2/gradle/wrapper/gradle-wrapper.properties b/hello-gl2/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip