build: upgrade AGP to 8.1.4

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) {

Android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="app.intra">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

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 {

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

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