[camera_android] Set buildconfig to true for compatibility with AGP 8.0+ (flutter#4951)

gmackall · web-flow · commit 4e2cc503665c · 2023-09-25T16:44:48.000Z
Fixes flutter#134818 See flutter/packages#4535 for an example of when this was done for a different plugin.
diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.10.8+10
+
+* Sets android.defaults.buildfeatures.buildconfig to true for compatibility with AGP 8.0+.
+
 ## 0.10.8+9
 
 * Removes usage of `_ambiguate` method in example.
diff --git a/packages/camera/camera_android/android/build.gradle b/packages/camera/camera_android/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
     }
 }
 
@@ -27,6 +27,9 @@ project.getTasks().withType(JavaCompile){
 apply plugin: 'com.android.library'
 
 android {
+buildFeatures {
+        buildConfig true
+    }
     // Conditional for compatibility with AGP <4.2.
     if (project.android.hasProperty("namespace")) {
         namespace 'io.flutter.plugins.camera'
diff --git a/packages/camera/camera_android/example/android/build.gradle b/packages/camera/camera_android/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
     }
 }
 
diff --git a/packages/camera/camera_android/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/camera/camera_android/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
diff --git a/packages/camera/camera_android/pubspec.yaml b/packages/camera/camera_android/pubspec.yaml
@@ -3,7 +3,7 @@ description: Android implementation of the camera plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
 
-version: 0.10.8+9
+version: 0.10.8+10
 
 environment:
   sdk: ">=2.19.0 <4.0.0"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:7.0.2'`
	`12`	`+ classpath 'com.android.tools.build:gradle:8.1.1'`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`@@ -27,6 +27,9 @@ project.getTasks().withType(JavaCompile){`
`27`	`27`	`apply plugin: 'com.android.library'`
`28`	`28`
`29`	`29`	`android {`
	`30`	`+buildFeatures {`
	`31`	`+ buildConfig true`
	`32`	`+ }`
`30`	`33`	`// Conditional for compatibility with AGP <4.2.`
`31`	`34`	`if (project.android.hasProperty("namespace")) {`
`32`	`35`	`namespace 'io.flutter.plugins.camera'`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:7.4.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:8.1.1'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`