feature: upgrade AGP to 4.2.0-alpha15, Gradle to 6.7, Polyfill to 0.1.3

2BAB · Oct 29, 2020 · da39b73 · da39b73
1 parent 1e83f1b
commit da39b73
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import BuildConfig.Deps
 
 buildscript {
     group = "me.2bab"
-    version = "3.0.0"
+    version = "3.0.1"
 
     repositories {
         google()

diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -3,8 +3,8 @@ object BuildConfig {
 
     object Deps {
         const val ktStd = "stdlib-jdk8"
-        const val agp = "com.android.tools.build:gradle:4.2.0-alpha12"
-        const val polyfill = "me.2bab:polyfill:0.1.2"
+        const val agp = "com.android.tools.build:gradle:4.2.0-alpha15"
+        const val polyfill = "me.2bab:polyfill:0.1.3"
 
         // Test
         const val junit = "junit:junit:4.12"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,8 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-<<<<<<< HEAD
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-=======
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
->>>>>>> dev
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,7 +1,7 @@
 buildscript {
 
     project.extra["kotlinVersion"] = "1.4.10"
-    project.extra["agpVersion"] = "4.2.0-alpha12"
+    project.extra["agpVersion"] = "4.2.0-alpha15"
 
     repositories {
         google()
@@ -14,7 +14,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:${project.extra["agpVersion"]}")
         // Switch to test local / remote dependencies
         classpath(fileTree(mapOf("dir" to "../build/libs", "include" to arrayOf("*.jar"))))
-        classpath("me.2bab:polyfill:0.1.2")
+        classpath("me.2bab:polyfill:0.1.3")
 //        classpath("me.2bab:seal:3.0.0")
     }
 

diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Sep 22 17:43:42 SGT 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME