From a36c83b5619445c7d06b578a31b097350a6d8904 Mon Sep 17 00:00:00 2001 From: jyyi1 Date: Mon, 31 Mar 2025 20:57:19 -0400 Subject: [PATCH] build: upgrade AGP to 8.1.4 --- Android/app/build.gradle | 4 +- Android/app/src/main/AndroidManifest.xml | 3 +- Android/build.gradle | 6 +- Android/buildscript-gradle.lockfile | 181 +- Android/gradle.properties | 5 + Android/gradle/verification-metadata.xml | 1581 +++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 717 insertions(+), 1065 deletions(-) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index c360de55..a59d83ef 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' // See https://developer.android.com/studio/publish/app-signing#secure-shared-keystore @@ -94,6 +93,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'app.intra' } repositories { @@ -139,8 +139,8 @@ dependencies { } // For Firebase Analytics -apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.firebase-perf' +apply plugin: 'com.google.gms.google-services' // Go backend build tasks tasks.register('compileGoBackend', Exec) { diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index e8e8446e..82d25892 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/Android/build.gradle b/Android/build.gradle index 1c947f96..cfb1e304 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -16,11 +16,11 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:8.1.4' // For Firebase Analytics - classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:perf-plugin:1.4.0' + classpath 'com.google.gms:google-services:4.4.1' + classpath 'com.google.firebase:perf-plugin:1.4.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' } dependencyLocking { diff --git a/Android/buildscript-gradle.lockfile b/Android/buildscript-gradle.lockfile index 7e706949..a49fcc19 100644 --- a/Android/buildscript-gradle.lockfile +++ b/Android/buildscript-gradle.lockfile @@ -1,126 +1,133 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.databinding:databinding-common:7.0.4=classpath -androidx.databinding:databinding-compiler-common:7.0.4=classpath -com.android.databinding:baseLibrary:7.0.4=classpath -com.android.tools.analytics-library:crash:30.0.4=classpath -com.android.tools.analytics-library:protos:30.0.4=classpath -com.android.tools.analytics-library:shared:30.0.4=classpath -com.android.tools.analytics-library:tracker:30.0.4=classpath -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath -com.android.tools.build:aapt2-proto:7.0.4-7396180=classpath -com.android.tools.build:aaptcompiler:7.0.4=classpath -com.android.tools.build:apksig:7.0.4=classpath -com.android.tools.build:apkzlib:7.0.4=classpath -com.android.tools.build:builder-model:7.0.4=classpath -com.android.tools.build:builder-test-api:7.0.4=classpath -com.android.tools.build:builder:7.0.4=classpath -com.android.tools.build:bundletool:1.6.0=classpath -com.android.tools.build:gradle-api:7.0.4=classpath -com.android.tools.build:gradle:7.0.4=classpath -com.android.tools.build:manifest-merger:30.0.4=classpath +androidx.databinding:databinding-common:8.1.4=classpath +androidx.databinding:databinding-compiler-common:8.1.4=classpath +com.android.databinding:baseLibrary:8.1.4=classpath +com.android.tools.analytics-library:crash:31.1.4=classpath +com.android.tools.analytics-library:protos:31.1.4=classpath +com.android.tools.analytics-library:shared:31.1.4=classpath +com.android.tools.analytics-library:tracker:31.1.4=classpath +com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath +com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath +com.android.tools.build:aapt2-proto:8.1.4-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.4=classpath +com.android.tools.build:apksig:8.1.4=classpath +com.android.tools.build:apkzlib:8.1.4=classpath +com.android.tools.build:builder-model:8.1.4=classpath +com.android.tools.build:builder-test-api:8.1.4=classpath +com.android.tools.build:builder:8.1.4=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.4=classpath +com.android.tools.build:gradle-settings-api:8.1.4=classpath +com.android.tools.build:gradle:8.1.4=classpath +com.android.tools.build:manifest-merger:31.1.4=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.0.4=classpath -com.android.tools.layoutlib:layoutlib-api:30.0.4=classpath -com.android.tools.lint:lint-model:30.0.4=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.0.4=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4=classpath -com.android.tools:annotations:30.0.4=classpath -com.android.tools:common:30.0.4=classpath -com.android.tools:dvlib:30.0.4=classpath -com.android.tools:repository:30.0.4=classpath -com.android.tools:sdk-common:30.0.4=classpath -com.android.tools:sdklib:30.0.4=classpath -com.android:signflinger:7.0.4=classpath -com.android:zipflinger:7.0.4=classpath -com.google.android.gms:strict-version-matcher-plugin:1.2.2=classpath +com.android.tools.ddms:ddmlib:31.1.4=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.4=classpath +com.android.tools.lint:lint-model:31.1.4=classpath +com.android.tools.lint:lint-typedef-remover:31.1.4=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.4=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.4=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.4=classpath +com.android.tools:annotations:31.1.4=classpath +com.android.tools:common:31.1.4=classpath +com.android.tools:dvlib:31.1.4=classpath +com.android.tools:repository:31.1.4=classpath +com.android.tools:sdk-common:31.1.4=classpath +com.android.tools:sdklib:31.1.4=classpath +com.android:signflinger:8.1.4=classpath +com.android:zipflinger:8.1.4=classpath +com.google.android.gms:strict-version-matcher-plugin:1.2.4=classpath com.google.android:annotations:4.1.1.4=classpath -com.google.api.grpc:proto-google-common-protos:1.12.0=classpath +com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath -com.google.code.gson:gson:2.8.6=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.code.gson:gson:2.8.9=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.3.4=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.firebase:firebase-crashlytics-buildtools:2.8.1=classpath com.google.firebase:firebase-crashlytics-gradle:2.8.1=classpath -com.google.firebase:perf-plugin:1.4.0=classpath +com.google.firebase:perf-plugin:1.4.1=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath -com.google.gms:google-services:4.3.10=classpath +com.google.gms:google-services:4.4.1=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.10.0=classpath -com.google.protobuf:protobuf-java:3.10.0=classpath -com.google.testing.platform:core-proto:0.0.8-alpha04=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath com.sun.activation:javax.activation:1.2.0=classpath com.sun.istack:istack-commons-runtime:3.0.8=classpath com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath -commons-codec:commons-codec:1.10=classpath +commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath -io.grpc:grpc-api:1.21.1=classpath -io.grpc:grpc-context:1.21.1=classpath -io.grpc:grpc-core:1.21.1=classpath -io.grpc:grpc-netty:1.21.1=classpath -io.grpc:grpc-protobuf-lite:1.21.1=classpath -io.grpc:grpc-protobuf:1.21.1=classpath -io.grpc:grpc-stub:1.21.1=classpath -io.netty:netty-buffer:4.1.34.Final=classpath -io.netty:netty-codec-http2:4.1.34.Final=classpath -io.netty:netty-codec-http:4.1.34.Final=classpath -io.netty:netty-codec-socks:4.1.34.Final=classpath -io.netty:netty-codec:4.1.34.Final=classpath -io.netty:netty-common:4.1.34.Final=classpath -io.netty:netty-handler-proxy:4.1.34.Final=classpath -io.netty:netty-handler:4.1.34.Final=classpath -io.netty:netty-resolver:4.1.34.Final=classpath -io.netty:netty-transport:4.1.34.Final=classpath -io.opencensus:opencensus-api:0.21.0=classpath -io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath +io.perfmark:perfmark-api:0.23.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath +javax.annotation:javax.annotation-api:1.3.2=classpath javax.inject:javax.inject:1=classpath net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.antlr:antlr4:4.5.3=classpath -org.apache.commons:commons-compress:1.20=classpath -org.apache.httpcomponents:httpclient:4.5.6=classpath -org.apache.httpcomponents:httpcore:4.4.10=classpath +org.apache.commons:commons-compress:1.21=classpath +org.apache.httpcomponents:httpclient:4.5.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath -org.bouncycastle:bcpkix-jdk15on:1.56=classpath -org.bouncycastle:bcprov-jdk15on:1.56=classpath -org.checkerframework:checker-qual:3.5.0=classpath -org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath +org.bitbucket.b_c:jose4j:0.7.0=classpath +org.bouncycastle:bcpkix-jdk15on:1.67=classpath +org.bouncycastle:bcprov-jdk15on:1.67=classpath +org.checkerframework:checker-qual:3.12.0=classpath +org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath org.jdom:jdom2:2.0.6=classpath -org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath -org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.0=classpath -org.ow2.asm:asm-commons:9.0=classpath -org.ow2.asm:asm-tree:9.0=classpath -org.ow2.asm:asm-util:7.0=classpath -org.ow2.asm:asm:9.0=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath +org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath xml-apis:xml-apis:1.4.01=classpath diff --git a/Android/gradle.properties b/Android/gradle.properties index 70dae5be..65b52bc7 100644 --- a/Android/gradle.properties +++ b/Android/gradle.properties @@ -22,6 +22,11 @@ org.gradle.jvmargs=-Xmx2048m android.enableJetifier=true android.useAndroidX=true +# Keep legacy AGP behavior after upgrading to AGP 8 +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false + ANDROID_COMPILE_SDK_VERSION=33 ANDROID_BUILD_TOOLS_VERSION=33.0.0 diff --git a/Android/gradle/verification-metadata.xml b/Android/gradle/verification-metadata.xml index f5ae27e4..39000817 100644 --- a/Android/gradle/verification-metadata.xml +++ b/Android/gradle/verification-metadata.xml @@ -1,5 +1,5 @@ - + true false @@ -64,9 +64,6 @@ - - - @@ -156,20 +153,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -242,9 +239,6 @@ - - - @@ -287,9 +281,6 @@ - - - @@ -478,215 +469,220 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -697,145 +693,180 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + + + + + + + + + @@ -965,12 +996,12 @@ - - - + + + - - + + @@ -981,12 +1012,12 @@ - - - + + + - - + + @@ -1015,25 +1046,25 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + @@ -1052,22 +1083,12 @@ - - - - - - - - - - - - - + + + - - + + @@ -1078,19 +1099,9 @@ - - - - - - - - - - - - - + + + @@ -1227,9 +1238,6 @@ - - - @@ -1250,12 +1258,12 @@ - - - + + + - - + + @@ -1274,12 +1282,12 @@ - - - + + + - - + + @@ -1290,19 +1298,6 @@ - - - - - - - - - - - - - @@ -1311,19 +1306,17 @@ - - - + + + - - - - + + - - - + + + @@ -1331,6 +1324,11 @@ + + + + + @@ -1360,30 +1358,30 @@ - - - - - - - - + + + + + + + + - - + + - - - + + + - - + + @@ -1394,30 +1392,22 @@ - - - - - - - - - - - + + + - - - + + + - - + + @@ -1534,14 +1524,6 @@ - - - - - - - - @@ -1550,6 +1532,14 @@ + + + + + + + + @@ -1566,177 +1556,166 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - - - - - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -1760,6 +1739,14 @@ + + + + + + + + @@ -1768,14 +1755,6 @@ - - - - - - - - @@ -1785,25 +1764,16 @@ - - - - - - - - - @@ -1818,6 +1788,11 @@ + + + + + @@ -1850,19 +1825,6 @@ - - - - - - - - - - - - - @@ -1883,54 +1845,22 @@ + + + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1948,9 +1878,22 @@ - - - + + + + + + + + + + + + + + + + @@ -1961,14 +1904,19 @@ + + + + + - - - + + + @@ -1976,12 +1924,17 @@ - - - + + + - - + + + + + + + @@ -1992,20 +1945,28 @@ - - - + + + + + + + + + + + - - + + - - - + + + - - + + @@ -2016,11 +1977,6 @@ - - - - - @@ -2029,216 +1985,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2285,43 +2055,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2338,110 +2071,59 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2451,17 +2133,11 @@ - - - - - - @@ -2471,89 +2147,62 @@ - - - - - - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2574,14 +2223,6 @@ - - - - - - - - diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties index ffed3a25..da1db5f0 100644 --- a/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists