chore(android): set compileOptions only if AGP < 8

AndreiCalazans · mikehardy · commit f16ad136e721 · 2023-09-01T19:55:37.000-05:00
diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle
@@ -125,10 +125,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/app-check/android/build.gradle b/packages/app-check/android/build.gradle
@@ -81,9 +81,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
   sourceSets {
     main {
diff --git a/packages/app-distribution/android/build.gradle b/packages/app-distribution/android/build.gradle
@@ -72,10 +72,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle
@@ -80,9 +80,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
 
   sourceSets {
diff --git a/packages/auth/android/build.gradle b/packages/auth/android/build.gradle
@@ -71,9 +71,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
 }
 
diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle
@@ -78,9 +78,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
 }
 
diff --git a/packages/database/android/build.gradle b/packages/database/android/build.gradle
@@ -72,9 +72,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
   sourceSets {
     main {
diff --git a/packages/dynamic-links/android/build.gradle b/packages/dynamic-links/android/build.gradle
@@ -72,9 +72,12 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
 }
 
diff --git a/packages/firestore/android/build.gradle b/packages/firestore/android/build.gradle
@@ -72,9 +72,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
   sourceSets {
     main {
diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle
@@ -72,10 +72,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/in-app-messaging/android/build.gradle b/packages/in-app-messaging/android/build.gradle
@@ -97,10 +97,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/installations/android/build.gradle b/packages/installations/android/build.gradle
@@ -72,10 +72,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/messaging/android/build.gradle b/packages/messaging/android/build.gradle
@@ -106,9 +106,12 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
 }
 
diff --git a/packages/ml/android/build.gradle b/packages/ml/android/build.gradle
@@ -72,10 +72,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle
@@ -105,10 +105,14 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
+
   sourceSets {
     main {
       java.srcDirs = ['src/main/java', 'src/reactnative/java']
diff --git a/packages/remote-config/android/build.gradle b/packages/remote-config/android/build.gradle
@@ -72,9 +72,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
   sourceSets {
     main {
diff --git a/packages/storage/android/build.gradle b/packages/storage/android/build.gradle
@@ -72,9 +72,12 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
+
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
 }
 
diff --git a/scripts/_TEMPLATE_/android/build.gradle b/scripts/_TEMPLATE_/android/build.gradle
@@ -72,9 +72,11 @@ android {
     disable 'GradleCompatible'
     abortOnError false
   }
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+  if (agpVersion < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_11
+      targetCompatibility JavaVersion.VERSION_11
+    }
   }
   sourceSets {
     main {

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,11 @@ android {`
`80`	`80`	`disable 'GradleCompatible'`
`81`	`81`	`abortOnError false`
`82`	`82`	`}`
`83`		`- compileOptions {`
`84`		`- sourceCompatibility JavaVersion.VERSION_11`
`85`		`- targetCompatibility JavaVersion.VERSION_11`
	`83`	`+ if (agpVersion < 8) {`
	`84`	`+ compileOptions {`
	`85`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`86`	`+ targetCompatibility JavaVersion.VERSION_11`
	`87`	`+ }`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,11 @@ android {`
`71`	`71`	`disable 'GradleCompatible'`
`72`	`72`	`abortOnError false`
`73`	`73`	`}`
`74`		`- compileOptions {`
`75`		`- sourceCompatibility JavaVersion.VERSION_11`
`76`		`- targetCompatibility JavaVersion.VERSION_11`
	`74`	`+ if (agpVersion < 8) {`
	`75`	`+ compileOptions {`
	`76`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`77`	`+ targetCompatibility JavaVersion.VERSION_11`
	`78`	`+ }`
`77`	`79`	`}`
`78`	`80`	`}`
`79`	`81`
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,11 @@ android {`
`78`	`78`	`disable 'GradleCompatible'`
`79`	`79`	`abortOnError false`
`80`	`80`	`}`
`81`		`- compileOptions {`
`82`		`- sourceCompatibility JavaVersion.VERSION_11`
`83`		`- targetCompatibility JavaVersion.VERSION_11`
	`81`	`+ if (agpVersion < 8) {`
	`82`	`+ compileOptions {`
	`83`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`84`	`+ targetCompatibility JavaVersion.VERSION_11`
	`85`	`+ }`
`84`	`86`	`}`
`85`	`87`	`}`
`86`	`88`
Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,12 @@ android {`
`72`	`72`	`disable 'GradleCompatible'`
`73`	`73`	`abortOnError false`
`74`	`74`	`}`
`75`		`- compileOptions {`
`76`		`- sourceCompatibility JavaVersion.VERSION_11`
`77`		`- targetCompatibility JavaVersion.VERSION_11`
	`75`	`+`
	`76`	`+ if (agpVersion < 8) {`
	`77`	`+ compileOptions {`
	`78`	`+ sourceCompatibility JavaVersion.VERSION_11`
	`79`	`+ targetCompatibility JavaVersion.VERSION_11`
	`80`	`+ }`
`78`	`81`	`}`
`79`	`82`	`}`
`80`	`83`