Merge pull request kivy#1507 from opacam/fix-ci-gradle

inclement · web-flow · commit 7f8242f7b8a3 · 2018-12-09T12:35:05.000Z
Update gradle version
diff --git a/pythonforandroid/bootstraps/sdl2/build/gradle/wrapper/gradle-wrapper.properties b/pythonforandroid/bootstraps/sdl2/build/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-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.gradle
@@ -2,9 +2,10 @@
 buildscript {
     repositories {
        jcenter()
+       google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
     }
 }
 
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -847,7 +847,9 @@ def apk(self, args):
 
                 # gradle output apks somewhere else
                 # and don't have version in file
-                apk_dir = join(dist.dist_dir, "build", "outputs", "apk")
+                apk_dir = join(dist.dist_dir,
+                               "build", "outputs", "apk",
+                               args.build_mode)
                 apk_glob = "*-{}.apk"
                 apk_add_version = True
 

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`	`buildscript {`
`3`	`3`	`repositories {`
`4`	`4`	`jcenter()`
	`5`	`+ google()`
`5`	`6`	`}`
`6`	`7`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:2.3.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`8`	`9`	`}`
`9`	`10`	`}`
`10`	`11`