Merge branch 'master' into feature/geetest

Author: crossle

app/build.gradle

@@ -16,9 +16,9 @@ plugins {
 }
 
 def versionMajor = 3
-def versionMinor = 3
-def versionPatch = 4
-def versionBuild = 0
+def versionMinor = 4
+def versionPatch = 0
+def versionBuild = 3
 
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'

app/src/main/java/one/mixin/android/web3/js/Web3Signer.kt

@@ -401,14 +401,14 @@ object Web3Signer {
         priv: ByteArray,
         message: String,
     ): String {
-        val holder = Keypair.fromSecretKey(priv)
+        val keyPair = Keypair.fromSecretKey(priv)
         val m =
             try {
                 message.decodeBase58()
             } catch (e: Exception) {
                 message.removePrefix("0x").hexStringToByteArray()
             }
-        val sig = holder.sign(m)
+        val sig = keyPair.sign(m)
         return sig.toHex()
     }
 

build.gradle

@@ -200,12 +200,5 @@ allprojects {
             }
         }
 
-        //noinspection JcenterRepositoryObsolete
-        jcenter() {
-            content {
-                includeModule("jp.wasabeef", "glide-transformations")
-            }
-        }
-
     }
 }

gradle.properties

@@ -8,7 +8,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=false
 android.useAndroidX=true
-android.enableR8.fullMode=false
+#android.enableR8.fullMode=false
 org.gradle.jvmargs=-Xmx10g -XX:+UseParallelGC
 kotlin.daemon.jvmargs=Xmx10g
 # When configured, Gradle will run in incubating parallel mode.
@@ -26,6 +26,4 @@ kapt.use.worker.api=true
 kapt.incremental.apt=true
 kapt.include.compile.classpath=false
 
-#SENTRY.DSN=your-sentry-dsn-here
-SENTRY.TRACES.RATE.DEBUG=1.0
-SENTRY.TRACES.RATE.RELEASE=0.1
+android.r8.optimizedResourceShrinking=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME