Update to AGP 7

Everything seems to work except for the dungeon map.
square · Jul 29, 2021 · f76589a · f76589a
1 parent c04f696
commit f76589a
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -9,7 +9,7 @@ object Versions {
 
 @Suppress("unused")
 object Dependencies {
-  const val android_gradle_plugin = "com.android.tools.build:gradle:4.2.1"
+  const val android_gradle_plugin = "com.android.tools.build:gradle:7.0.0"
 
   object AndroidX {
     const val activity = "androidx.activity:activity:1.2.3"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     workflow_version = "1.0.0-alpha.7"
 
     deps = [
-        agp: "com.android.tools.build:gradle:4.2.1",
+        agp: "com.android.tools.build:gradle:7.0.0",
         appcompat: 'androidx.appcompat:appcompat:1.2.0',
         constraintlayout: 'androidx.constraintlayout:constraintlayout:2.0.1',
         kotlin: [

diff --git a/samples/tutorial/gradle/wrapper/gradle-wrapper.jar b/samples/tutorial/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/tutorial/gradle/wrapper/gradle-wrapper.properties b/samples/tutorial/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/tutorial/gradlew b/samples/tutorial/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )