Update AGP to 8.2.2 and Gradle version to 8.2

AGP = Android Gradle plugin
akahukas · Feb 23, 2024 · a733413 · a733413
1 parent bfd6712
commit a733413
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/original-repository/samples/geospatial_java/app/build.gradle b/original-repository/samples/geospatial_java/app/build.gradle
@@ -37,6 +37,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.google.ar.core.examples.java.geospatial'
 }
 
 dependencies {

diff --git a/original-repository/samples/geospatial_java/app/src/main/AndroidManifest.xml b/original-repository/samples/geospatial_java/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
    limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.ar.core.examples.java.geospatial">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission android:name="android.permission.CAMERA"/>
 

diff --git a/original-repository/samples/geospatial_java/build.gradle b/original-repository/samples/geospatial_java/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/original-repository/samples/geospatial_java/gradle.properties b/original-repository/samples/geospatial_java/gradle.properties
@@ -20,3 +20,6 @@ org.gradle.jvmargs=-Xmx1536m
 # For details, see https://developer.android.com/jetpack/androidx/migrate
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/original-repository/samples/geospatial_java/gradle/wrapper/gradle-wrapper.properties b/original-repository/samples/geospatial_java/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ android { @@
                 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             }
         }
+        namespace 'com.google.ar.core.examples.java.geospatial'
     }
     dependencies {
@@ Expand Down @@