build(deps): bump android gradle plugin to 7.0.0 / gradle to 7.1.1

mikehardy · mikehardy · commit 05b2426a7722 · 2021-07-31T09:03:50.000-05:00
- requires react-native cli workaround (fixed upstream unreleased)
- requires a removal of buck build stanza from template app/build.gradle (buck unused, it's fine)
diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/auth/android/build.gradle b/packages/auth/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/database/android/build.gradle b/packages/database/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/dynamic-links/android/build.gradle b/packages/dynamic-links/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/firestore/android/build.gradle b/packages/firestore/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/in-app-messaging/android/build.gradle b/packages/in-app-messaging/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/messaging/android/build.gradle b/packages/messaging/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/ml/android/build.gradle b/packages/ml/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.2.1")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/remote-config/android/build.gradle b/packages/remote-config/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/packages/storage/android/build.gradle b/packages/storage/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:4.1.3")
+      classpath("com.android.tools.build:gradle:7.0.0")
     }
   }
 }
diff --git a/scripts/_TEMPLATE_/android/build.gradle b/scripts/_TEMPLATE_/android/build.gradle
@@ -4,12 +4,12 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.1.3'
+      classpath("com.android.tools.build:gradle:7.0.0")
   }
 }
 
 plugins {
-  id "io.invertase.gradle.build" version "1.4"
+  id "io.invertase.gradle.build" version "1.5"
 }
 
 project.ext {
@@ -21,11 +21,11 @@ project.ext {
         compileSdk: 30,
         // optional as gradle.buildTools comes with one by default
         // overriding here though to match the version RN uses
-        buildTools: "30.0.2"
+        buildTools: "31.0.0"
       ],
 
       firebase          : [
-        bom: "26.8.0"
+        bom: "28.3.0"
       ],
     ],
   ])
diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle
@@ -142,12 +142,4 @@ dependencies {
     androidTestImplementation(project(path: ":detox"))
 }
 
-// Run this once to be able to run the application with BUCK
-// puts all compile dependencies into folder libs for BUCK to use
-task copyDownloadableDepsToLibs(type: Copy) {
-  from configurations.compile
-  into 'libs'
-}
-
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: file('../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle'); applyNativeModulesAppBuildGradle(project)
diff --git a/tests/android/build.gradle b/tests/android/build.gradle
@@ -32,7 +32,7 @@ buildscript {
   }
   dependencies {
     classpath 'com.google.gms:google-services:4.3.8' // https://developers.google.com/android/guides/google-services-plugin
-    classpath 'com.android.tools.build:gradle:4.2.1'
+    classpath 'com.android.tools.build:gradle:7.0.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     classpath 'com.google.firebase:perf-plugin:1.4.0'
     classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
diff --git a/tests/android/gradle/wrapper/gradle-wrapper.jar b/tests/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tests/android/gradlew b/tests/android/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
diff --git a/tests/patches/@react-native-community+cli-platform-android+5.0.1.patch b/tests/patches/@react-native-community+cli-platform-android+5.0.1.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
+index 1c0515f..c07bf32 100644
+--- a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
++++ b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
+@@ -128,7 +128,7 @@ class ReactNativeModules {
+    * @param generatedFileContentsTemplate
+    */
+   void generatePackagesFile(File outputDir, String generatedFileName, String generatedFileContentsTemplate) {
+-    ArrayList<HashMap<String, String>>[] packages = this.reactNativeModules
++    ArrayList<HashMap<String, String>> packages = this.reactNativeModules
+     String packageName = this.packageName
+ 
+     String packageImports = ""

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`dependencies {`
`14`		`- classpath("com.android.tools.build:gradle:4.1.3")`
	`14`	`+ classpath("com.android.tools.build:gradle:7.0.0")`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`