Upgrade to AGP 8.5.2 #524
+1,291
−1,266
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -16,12 +16,12 @@ buildscript { | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:8.5.2' | ||
|
|
||
| // For Firebase Analytics | ||
| classpath 'com.google.gms:google-services:4.4.2' | ||
| classpath 'com.google.firebase:perf-plugin:1.4.2' | ||
| classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2' | ||
| } | ||
| dependencyLocking { | ||
| lockAllConfigurations() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,127 +1,132 @@ | ||
| # 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:8.5.2=classpath | ||
| androidx.databinding:databinding-compiler-common:8.5.2=classpath | ||
| com.android.databinding:baseLibrary:8.5.2=classpath | ||
| com.android.tools.analytics-library:crash:31.5.2=classpath | ||
| com.android.tools.analytics-library:protos:31.5.2=classpath | ||
| com.android.tools.analytics-library:shared:31.5.2=classpath | ||
| com.android.tools.analytics-library:tracker:31.5.2=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.5.2-11315950=classpath | ||
| com.android.tools.build:aaptcompiler:8.5.2=classpath | ||
| com.android.tools.build:apksig:8.5.2=classpath | ||
| com.android.tools.build:apkzlib:8.5.2=classpath | ||
| com.android.tools.build:builder-model:8.5.2=classpath | ||
| com.android.tools.build:builder-test-api:8.5.2=classpath | ||
| com.android.tools.build:builder:8.5.2=classpath | ||
| com.android.tools.build:bundletool:1.16.0=classpath | ||
| com.android.tools.build:gradle-api:8.5.2=classpath | ||
| com.android.tools.build:gradle-settings-api:8.5.2=classpath | ||
| com.android.tools.build:gradle:8.5.2=classpath | ||
| com.android.tools.build:manifest-merger:31.5.2=classpath | ||
| com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath | ||
| com.android.tools.ddms:ddmlib:31.5.2=classpath | ||
| com.android.tools.layoutlib:layoutlib-api:31.5.2=classpath | ||
| com.android.tools.lint:lint-model:31.5.2=classpath | ||
| com.android.tools.lint:lint-typedef-remover:31.5.2=classpath | ||
| com.android.tools.utp:android-device-provider-ddmlib-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-device-provider-gradle-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-host-coverage-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-host-logcat-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-host-retention-proto:31.5.2=classpath | ||
| com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.5.2=classpath | ||
| com.android.tools:annotations:31.5.2=classpath | ||
| com.android.tools:common:31.5.2=classpath | ||
| com.android.tools:dvlib:31.5.2=classpath | ||
| com.android.tools:repository:31.5.2=classpath | ||
| com.android.tools:sdk-common:31.5.2=classpath | ||
| com.android.tools:sdklib:31.5.2=classpath | ||
| com.android:signflinger:8.5.2=classpath | ||
| com.android:zipflinger:8.5.2=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:2.17.0=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.10.1=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.18.0=classpath | ||
| com.google.firebase:firebase-crashlytics-buildtools:3.0.2=classpath | ||
| com.google.firebase:firebase-crashlytics-gradle:3.0.2=classpath | ||
| com.google.firebase:perf-plugin:1.4.2=classpath | ||
| com.google.flatbuffers:flatbuffers-java:1.12.0=classpath | ||
| com.google.gms:google-services:4.4.2=classpath | ||
| com.google.guava:failureaccess:1.0.1=classpath | ||
| com.google.guava:guava:32.0.1-jre=classpath | ||
| com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath | ||
| com.google.j2objc:j2objc-annotations:2.8=classpath | ||
| com.google.jimfs:jimfs:1.1=classpath | ||
| com.google.protobuf:protobuf-java-util:3.22.3=classpath | ||
| com.google.protobuf:protobuf-java:3.22.3=classpath | ||
| com.google.testing.platform:core-proto:0.0.9-alpha02=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.11=classpath | ||
| commons-io:commons-io:2.13.0=classpath | ||
| commons-logging:commons-logging:1.2=classpath | ||
| io.grpc:grpc-api:1.57.0=classpath | ||
| io.grpc:grpc-context:1.57.0=classpath | ||
| io.grpc:grpc-core:1.57.0=classpath | ||
| io.grpc:grpc-netty:1.57.0=classpath | ||
| io.grpc:grpc-protobuf-lite:1.57.0=classpath | ||
| io.grpc:grpc-protobuf:1.57.0=classpath | ||
| io.grpc:grpc-stub:1.57.0=classpath | ||
| io.netty:netty-buffer:4.1.93.Final=classpath | ||
| io.netty:netty-codec-http2:4.1.93.Final=classpath | ||
| io.netty:netty-codec-http:4.1.93.Final=classpath | ||
| io.netty:netty-codec-socks:4.1.93.Final=classpath | ||
| io.netty:netty-codec:4.1.93.Final=classpath | ||
| io.netty:netty-common:4.1.93.Final=classpath | ||
| io.netty:netty-handler-proxy:4.1.93.Final=classpath | ||
| io.netty:netty-handler:4.1.93.Final=classpath | ||
| io.netty:netty-resolver:4.1.93.Final=classpath | ||
| io.netty:netty-transport-native-unix-common:4.1.93.Final=classpath | ||
| io.netty:netty-transport:4.1.93.Final=classpath | ||
| io.perfmark:perfmark-api:0.26.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.apache.commons:commons-compress:1.21=classpath | ||
| org.apache.httpcomponents:httpclient:4.5.14=classpath | ||
| org.apache.httpcomponents:httpcore:4.4.16=classpath | ||
| org.apache.httpcomponents:httpmime:4.5.6=classpath | ||
| org.bitbucket.b_c:jose4j:0.9.5=classpath | ||
| org.bouncycastle:bcpkix-jdk18on:1.77=classpath | ||
| org.bouncycastle:bcprov-jdk18on:1.77=classpath | ||
| org.bouncycastle:bcutil-jdk18on:1.77=classpath | ||
| org.checkerframework:checker-qual:3.33.0=classpath | ||
| org.codehaus.mojo:animal-sniffer-annotations:1.23=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.20200330=classpath | ||
| org.jetbrains.kotlin:kotlin-reflect:1.9.20=classpath | ||
| org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath | ||
| org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath | ||
| org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath | ||
| org.jetbrains:annotations:23.0.0=classpath | ||
| org.jvnet.staxex:stax-ex:1.8.1=classpath | ||
| org.ow2.asm:asm-analysis:9.6=classpath | ||
| org.ow2.asm:asm-commons:9.6=classpath | ||
| org.ow2.asm:asm-tree:9.6=classpath | ||
| org.ow2.asm:asm-util:9.6=classpath | ||
| org.ow2.asm:asm:9.6=classpath | ||
| org.slf4j:slf4j-api:1.7.30=classpath | ||
| org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath | ||
| empty= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -25,5 +25,8 @@ android.useAndroidX=true | ||
| ANDROID_COMPILE_SDK_VERSION=33 | ||
| ANDROID_BUILD_TOOLS_VERSION=33.0.0 | ||
|
|
||
| ANDROID_MIN_SDK_VERSION=21 | ||
| ANDROID_TARGET_SDK_VERSION=33 | ||
|
|
||
| android.nonTransitiveRClass=false | ||
| android.nonFinalResIds=false | ||
|
Comment on lines
+31
to
+32
There was a problem hiding this comment. Are these two settings necessary? There was a problem hiding this comment. well, starting Android Gradle Plugin (AGP) version 8.0 and above, the default value for:
and, we are using those in: Also, I don't think we need to change how it's done, since I'm worried it might mess up other stuff. There was a problem hiding this comment. my suggestion is, if we're going to change these, we should do it in a separate PR. wdyt? |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,27 @@ | ||
| module localhost/Intra | ||
|
|
||
| go 1.22.0 | ||
|
|
||
| toolchain go1.23.4 | ||
|
|
||
| require ( | ||
| github.com/Jigsaw-Code/choir v1.0.1 | ||
| github.com/Jigsaw-Code/getsni v1.0.0 | ||
| github.com/Jigsaw-Code/outline-sdk v0.0.7 | ||
| github.com/stretchr/testify v1.8.2 | ||
| golang.org/x/mobile v0.0.0-20241213221354-a87c1cf6cf46 | ||
| golang.org/x/net v0.32.0 | ||
| golang.org/x/sys v0.28.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/eycorsican/go-tun2socks v1.16.11 // indirect | ||
| github.com/kr/text v0.2.0 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| golang.org/x/crypto v0.30.0 // indirect | ||
| golang.org/x/mod v0.22.0 // indirect | ||
| golang.org/x/sync v0.10.0 // indirect | ||
| golang.org/x/tools v0.28.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -28,24 +28,38 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk | ||
| golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||
| golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= | ||
| golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= | ||
| golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= | ||
| golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= | ||
| golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe h1:lrXv4yHeD9FA8PSJATWowP1QvexpyAPWmPia+Kbzql8= | ||
| golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe/go.mod h1:BrnXpEObnFxpaT75Jo9hsCazwOWcp7nVIa8NNuH5cuA= | ||
| golang.org/x/mobile v0.0.0-20241213221354-a87c1cf6cf46 h1:E+R1qmJL8cmWTyWXBHVtmqRxr7FdiTwntffsba1F1Tg= | ||
| golang.org/x/mobile v0.0.0-20241213221354-a87c1cf6cf46/go.mod h1:Sf9LBimL0mWKEdgAjRmJ6iu7Z34osHQTK/devqFbM2I= | ||
| golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= | ||
| golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= | ||
| golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= | ||
| golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= | ||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||
| golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= | ||
| golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= | ||
| golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= | ||
| golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= | ||
| golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= | ||
| golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= | ||
| golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= | ||
| golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= | ||
| golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= | ||
| golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= | ||
| golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||
| golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||
| golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= | ||
| golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
| golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= | ||
| golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||
| golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= | ||
| golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= | ||
| golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= | ||
| golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= | ||
| golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= | ||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||
| gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= | ||
| gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we using it anywhere in the code? If not, I think we can remove this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, we are actually using it (code:
Intra/Android/app/src/main/java/app/intra/sys/firebase/LogWrapper.java
Line 19 in 5a48272
but, we could change the implementation, instead of using
BuildConfig. like, differentiateLogWrapperfor release and debug (src/debug/) mode. wdyt?