From 7fb110a43cfb2e4a10bd353ea5d25bc0b48deee5 Mon Sep 17 00:00:00 2001 From: mzennis Date: Thu, 31 Oct 2024 12:24:41 +0700 Subject: [PATCH 1/5] feat: upgrade agp to 8.7, disable dependency locking --- Android/app/build.gradle | 12 ++++++---- Android/build.gradle | 24 +++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index c360de55..aab848ef 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -61,6 +61,7 @@ android { vectorDrawables.useSupportLibrary = true testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } + namespace 'app.intra' lintOptions { // Ignore lint errors that we believe are safe to ignore. baseline file("lint-baseline.xml") @@ -125,11 +126,12 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation "androidx.viewpager2:viewpager2:1.0.0" // For Firebase Analytics, etc. - implementation 'com.google.firebase:firebase-analytics:19.0.2' // Last version for API <19 - implementation 'com.google.firebase:firebase-perf:20.0.4' - implementation 'com.google.firebase:firebase-crashlytics:18.2.6' - implementation 'com.google.firebase:firebase-crashlytics-ndk:18.2.6' - implementation 'com.google.firebase:firebase-config:21.0.1' + implementation 'com.google.firebase:firebase-analytics:22.1.2' // Last version for API <19 + implementation 'com.google.firebase:firebase-perf:21.0.2' + implementation 'com.google.firebase:firebase-crashlytics:19.2.1' + implementation 'com.google.firebase:firebase-crashlytics-ndk:19.2.1' + implementation 'com.google.firebase:firebase-config:22.0.1' + implementation 'com.google.firebase:firebase-core:21.1.1' // Go backend (use fileTree instead of files to prevent Android Studio sync errors) implementation fileTree(goBuildDir) { diff --git a/Android/build.gradle b/Android/build.gradle index 1c947f96..d51bf254 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -1,7 +1,7 @@ -dependencyLocking { - lockAllConfigurations() - lockMode = LockMode.STRICT -} +//dependencyLocking { +// lockAllConfigurations() +// lockMode = LockMode.STRICT +//} allprojects { repositories { @@ -16,17 +16,17 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:8.5.2' // For Firebase Analytics - classpath 'com.google.gms:google-services:4.3.10' - classpath 'com.google.firebase:perf-plugin:1.4.0' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' - } - dependencyLocking { - lockAllConfigurations() - lockMode = LockMode.STRICT + 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() +// lockMode = LockMode.STRICT +// } } task clean(type: Delete) { diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties index ffed3a25..48c0a02c 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.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 58662709c71ee835100ce1954e4fecda1e6a6ab2 Mon Sep 17 00:00:00 2001 From: mzennis Date: Thu, 31 Oct 2024 12:24:53 +0700 Subject: [PATCH 2/5] feat: set min sdk version to 21 --- Android/gradle.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Android/gradle.properties b/Android/gradle.properties index 70dae5be..2ba98a53 100644 --- a/Android/gradle.properties +++ b/Android/gradle.properties @@ -25,5 +25,9 @@ android.useAndroidX=true ANDROID_COMPILE_SDK_VERSION=33 ANDROID_BUILD_TOOLS_VERSION=33.0.0 -ANDROID_MIN_SDK_VERSION=16 +ANDROID_MIN_SDK_VERSION=21 ANDROID_TARGET_SDK_VERSION=33 +org.gradle.dependency.verification=off +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file From a35b414de5d68d2aa1069dff828186000bff6dc7 Mon Sep 17 00:00:00 2001 From: mzennis Date: Thu, 26 Dec 2024 11:56:17 +0900 Subject: [PATCH 3/5] feat: upgrade depenedencies --- Android/build.gradle | 16 +-- Android/buildscript-gradle.lockfile | 193 ++++++++++++++-------------- go.mod | 18 +-- go.sum | 14 ++ 4 files changed, 131 insertions(+), 110 deletions(-) diff --git a/Android/build.gradle b/Android/build.gradle index d51bf254..c9d388d3 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -1,7 +1,7 @@ -//dependencyLocking { -// lockAllConfigurations() -// lockMode = LockMode.STRICT -//} +dependencyLocking { + lockAllConfigurations() + lockMode = LockMode.STRICT +} allprojects { repositories { @@ -23,10 +23,10 @@ buildscript { classpath 'com.google.firebase:perf-plugin:1.4.2' classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2' } -// dependencyLocking { -// lockAllConfigurations() -// lockMode = LockMode.STRICT -// } + dependencyLocking { + lockAllConfigurations() + lockMode = LockMode.STRICT + } } task clean(type: Delete) { diff --git a/Android/buildscript-gradle.lockfile b/Android/buildscript-gradle.lockfile index 7e706949..9246814e 100644 --- a/Android/buildscript-gradle.lockfile +++ b/Android/buildscript-gradle.lockfile @@ -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: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.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: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.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:1.12.0=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.8.6=classpath -com.google.crypto.tink:tink:1.3.0-rc2=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.3.4=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.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.3.10=classpath +com.google.gms:google-services:4.4.2=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=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:1.3=classpath +com.google.j2objc:j2objc-annotations:2.8=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.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.10=classpath -commons-io:commons-io:2.4=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.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.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.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.14=classpath +org.apache.httpcomponents:httpcore:4.4.16=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.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.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:annotations:13.0=classpath -org.json:json:20180813=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.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.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 -xerces:xercesImpl:2.12.0=classpath -xml-apis:xml-apis:1.4.01=classpath empty= diff --git a/go.mod b/go.mod index 9f6368f2..e6c1e954 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,17 @@ module localhost/Intra -go 1.21.1 +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-20231006135142-2b44d11868fe - golang.org/x/net v0.16.0 - golang.org/x/sys v0.13.0 + golang.org/x/mobile v0.0.0-20241213221354-a87c1cf6cf46 + golang.org/x/net v0.32.0 + golang.org/x/sys v0.28.0 ) require ( @@ -17,9 +19,9 @@ require ( 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.14.0 // indirect - golang.org/x/mod v0.13.0 // indirect - golang.org/x/sync v0.4.0 // indirect - golang.org/x/tools v0.14.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 ) diff --git a/go.sum b/go.sum index 9af645de..7f3d147b 100644 --- a/go.sum +++ b/go.sum @@ -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= From cfe5ca137f86907ab6d2290d30d14dcfff7c6cc6 Mon Sep 17 00:00:00 2001 From: mzennis Date: Thu, 26 Dec 2024 11:56:51 +0900 Subject: [PATCH 4/5] feat: set buildconfig=true inside app/build.gradle instead --- Android/app/build.gradle | 3 +++ Android/gradle.properties | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index aab848ef..c347e109 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -95,6 +95,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + buildFeatures { + buildConfig = true + } } repositories { diff --git a/Android/gradle.properties b/Android/gradle.properties index 2ba98a53..a3e0d403 100644 --- a/Android/gradle.properties +++ b/Android/gradle.properties @@ -28,6 +28,5 @@ ANDROID_BUILD_TOOLS_VERSION=33.0.0 ANDROID_MIN_SDK_VERSION=21 ANDROID_TARGET_SDK_VERSION=33 org.gradle.dependency.verification=off -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false \ No newline at end of file From 2d8b7ac559567da3b8b58dc52fdd61e4525de540 Mon Sep 17 00:00:00 2001 From: mzennis Date: Thu, 26 Dec 2024 12:57:23 +0900 Subject: [PATCH 5/5] feat: re-enable org.gradle.dependency.verification --- Android/gradle.properties | 2 +- Android/gradle/verification-metadata.xml | 2302 +++++++++++----------- 2 files changed, 1150 insertions(+), 1154 deletions(-) diff --git a/Android/gradle.properties b/Android/gradle.properties index a3e0d403..f17c10a7 100644 --- a/Android/gradle.properties +++ b/Android/gradle.properties @@ -27,6 +27,6 @@ ANDROID_BUILD_TOOLS_VERSION=33.0.0 ANDROID_MIN_SDK_VERSION=21 ANDROID_TARGET_SDK_VERSION=33 -org.gradle.dependency.verification=off + android.nonTransitiveRClass=false android.nonFinalResIds=false \ No newline at end of file diff --git a/Android/gradle/verification-metadata.xml b/Android/gradle/verification-metadata.xml index f5ae27e4..cf4ef0e3 100644 --- a/Android/gradle/verification-metadata.xml +++ b/Android/gradle/verification-metadata.xml @@ -1,5 +1,5 @@ - + true false @@ -14,26 +14,46 @@ - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + @@ -101,13 +121,18 @@ - - - + + + + + + + + @@ -133,13 +158,26 @@ - - - + + + + + + + + + + + + + + + + @@ -156,20 +194,52 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + + + + + + + + + @@ -273,6 +343,11 @@ + + + + + @@ -334,22 +409,6 @@ - - - - - - - - - - - - - - - - @@ -366,6 +425,22 @@ + + + + + + + + + + + + + + + + @@ -478,215 +553,212 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -697,145 +769,228 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -847,130 +1002,143 @@ - - - - - - + + + + + + - - - + + + - - + + - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + - - - + + + - - + + + + + + + + + + @@ -981,12 +1149,12 @@ - - - + + + - - + + @@ -1015,25 +1183,25 @@ - - - + + + - - + + - - - + + + - - - + + + - - + + @@ -1052,45 +1220,48 @@ - - - + + + + + + - - - + + + + + + - - - + + + - - + + - - - - - - + + + - - - + + + - - - + + + @@ -1098,92 +1269,121 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + @@ -1194,12 +1394,12 @@ - - - + + + - - + + @@ -1210,52 +1410,67 @@ - - - + + + - - + + + + + + + - - - + + + - - + + + + + + + - - - + + + - - + + - - - + + + + + + - - + + + + - - - + + + - - + + - - - + + + - - + + @@ -1274,12 +1489,12 @@ - - - + + + - - + + @@ -1290,25 +1505,25 @@ - - - + + + - - - + + + - - + + - - - + + + - - + + @@ -1316,19 +1531,19 @@ - - - + + + - - - + + + - - - + + + @@ -1347,6 +1562,14 @@ + + + + + + + + @@ -1360,30 +1583,35 @@ - - - - - - - - + + + + + + + + - - + + + + + + + - - - + + + - - + + @@ -1394,9 +1622,12 @@ - - - + + + + + + @@ -1404,20 +1635,62 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + + + + + + + + + @@ -1534,28 +1807,20 @@ - - - - - - - - - - - + + + - - + + - - - + + + - - + + @@ -1566,177 +1831,161 @@ - - - - - - - - - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - + + @@ -1760,6 +2009,14 @@ + + + + + + + + @@ -1768,14 +2025,6 @@ - - - - - - - - @@ -1818,6 +2067,11 @@ + + + + + @@ -1850,29 +2104,11 @@ - - - - - - - - - - - - - - - - - - @@ -1883,82 +2119,55 @@ - - - + + + - - - - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + - - - + + + - - - - - - + + + - - - + + + - - - + + + - - - - + + - - - - - - - - - - - + + + @@ -1966,9 +2175,9 @@ - - - + + + @@ -1976,12 +2185,17 @@ - - - + + + + + + + + - - + + @@ -1992,33 +2206,41 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + - - - + + + @@ -2029,216 +2251,30 @@ - - - - - - + + + - - - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2285,161 +2321,172 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + - - - + + + - - + + + + - - - + + + - - + + - - - + + + - - + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + @@ -2471,89 +2518,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + @@ -2574,29 +2594,5 @@ - - - - - - - - - - - - - - - - - - - - - - - -