Update to AGP 3.4 and genymotion plugin 1.4.2
authorDa Risk <da_risk@geekorum.com>
Fri, 19 Apr 2019 16:55:43 -0700
changeset 114 573c45437ea9
parent 113 32e2a09387f8
child 115 c5d233e1c100
Update to AGP 3.4 and genymotion plugin 1.4.2
build.gradle.kts
buildSrc/build.gradle.kts
config/ci-buildcache.gradle
config/play-store-publish.gradle
gradle/wrapper/gradle-wrapper.properties
settings.gradle.kts
--- a/build.gradle.kts	Sun Apr 14 19:05:10 2019 -0700
+++ b/build.gradle.kts	Fri Apr 19 16:55:43 2019 -0700
@@ -22,7 +22,7 @@
 import java.net.URI
 
 plugins {
-    id("com.google.android.gms.oss-licenses-plugin") version "0.9.3.1" apply false
+    id("com.google.android.gms.oss-licenses-plugin") version "0.9.3.2" apply false
     id("com.google.gms.google-services") version "3.2.0" apply false
     id("io.fabric") version "1.25.4" apply false
     kotlin("android") version "1.3.30" apply false
--- a/buildSrc/build.gradle.kts	Sun Apr 14 19:05:10 2019 -0700
+++ b/buildSrc/build.gradle.kts	Fri Apr 19 16:55:43 2019 -0700
@@ -37,14 +37,14 @@
     google()
     maven {
         // Workaround for genymotion plugin not working on gradle 5.0
-        // we publish 1.4.1 version with fixes
+        // we publish 1.4.2 version with fixes
         url = URI("https://raw.githubusercontent.com/fbarthelery/genymotion-gradle-plugin/master/repo/")
     }
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:3.3.2")
-    implementation("com.genymotion:plugin:1.4.1")
+    implementation("com.android.tools.build:gradle:3.4.0")
+    implementation("com.genymotion:plugin:1.4.2")
     implementation("gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0")
     implementation("com.github.triplet.gradle:play-publisher:2.1.0")
 }
--- a/config/ci-buildcache.gradle	Sun Apr 14 19:05:10 2019 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/**
- * This file configure the remote build cache for a ci server.
- * It expects the CI_BUILD_CACHE_URL system property to be set.
- * You can set it as a command line argument with
- * -DCI_BUILD_CACHE_URL=http://cachenode.url/cache/
- * or in gradle.properties
- * systemProp.CI_BUILD_CACHE_URL=http://cachenode.url/cache/
- * See https://docs.gradle.org/current/userguide/build_cache.html
- * for more information
- */
-def ciBuildCacheUrl = System.getProperty("CI_BUILD_CACHE_URL")
-
-if (ciBuildCacheUrl != null) {
-    buildCache {
-        local {
-            enabled = false
-        }
-        remote(HttpBuildCache) {
-            url = "${ciBuildCacheUrl}"
-            push = true
-        }
-    }
-}
\ No newline at end of file
--- a/config/play-store-publish.gradle	Sun Apr 14 19:05:10 2019 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-// Configuration for "com.github.triplet.play" plugin
-// This configuration expects the given properties
-// PLAY_STORE_JSON_KEY_FILE: google play console service credentials json file to use
-// PLAY_STORE_TRACK: track to publish the build, default to internal but can be set to alpha, beta or production
-
-if (project.hasProperty("PLAY_STORE_JSON_KEY_FILE")) {
-    apply plugin: 'com.github.triplet.play'
-
-    play {
-        defaultToAppBundles = false
-        serviceAccountCredentials = file("${PLAY_STORE_JSON_KEY_FILE}")
-        track = project.properties.getOrDefault("PLAY_STORE_TRACK", "internal")
-    }
-
-    android.playAccountConfigs {
-        defaultAccountConfig {
-            serviceAccountCredentials = file("${PLAY_STORE_JSON_KEY_FILE}")
-        }
-    }
-
-    android.productFlavors {
-        google {
-            playAccountConfig = android.playAccountConfigs.defaultAccountConfig
-        }
-    }
-
-    play.track = project.properties.getOrDefault("PLAY_STORE_TRACK", "internal")
-}
--- a/gradle/wrapper/gradle-wrapper.properties	Sun Apr 14 19:05:10 2019 -0700
+++ b/gradle/wrapper/gradle-wrapper.properties	Fri Apr 19 16:55:43 2019 -0700
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
--- a/settings.gradle.kts	Sun Apr 14 19:05:10 2019 -0700
+++ b/settings.gradle.kts	Fri Apr 19 16:55:43 2019 -0700
@@ -29,7 +29,7 @@
         jcenter()
         maven {
             // Workaround for bug https://github.com/gradle/kotlin-dsl/issues/1186
-            // we publish oss-licenses-plugin 0.9.3.1
+            // we publish oss-licenses-plugin 0.9.3.2
             url = URI("https://raw.githubusercontent.com/fbarthelery/play-services-plugins/master/repo/")
         }
         google()
@@ -52,11 +52,6 @@
     }
 }
 
-// build cache settings for ci
-apply {
-    from("$rootDir/config/ci-buildcache.gradle")
-}
-
 include(":app")
 
 val GEEKDROID_PROJECT_DIR: String? by settings