diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts index 91111edc8..6fa81a68b 100644 --- a/V2rayNG/app/build.gradle.kts +++ b/V2rayNG/app/build.gradle.kts @@ -57,7 +57,7 @@ android { applicationVariants.all { val variant = this val versionCodes = - mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4, "all" to 0) + mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4) variant.outputs .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl } @@ -66,10 +66,16 @@ android { output.getFilter(com.android.build.OutputFile.ABI) else "all" + output.outputFileName = "v2rayNG_${variant.versionName}_${abi}.apk" - output.versionCodeOverride = (1000000 * versionCodes[abi]!!).plus( - variant.versionCode - ) + if(versionCodes.containsKey(abi)) + { + output.versionCodeOverride = (1000000 * versionCodes[abi]!!).plus(variant.versionCode) + } + else + { + return@forEach + } } } @@ -89,22 +95,22 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.11.0") implementation("androidx.cardview:cardview:1.0.0") - implementation("androidx.preference:preference-ktx:1.2.0") + implementation("androidx.preference:preference-ktx:1.2.1") implementation("androidx.recyclerview:recyclerview:1.3.2") - implementation("androidx.fragment:fragment-ktx:1.5.7") + implementation("androidx.fragment:fragment-ktx:1.6.2") implementation("androidx.multidex:multidex:2.0.1") implementation("androidx.viewpager2:viewpager2:1.1.0-beta02") // Androidx ktx - implementation("androidx.activity:activity-ktx:1.7.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") + implementation("androidx.activity:activity-ktx:1.8.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") //kotlin - implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") implementation("com.tencent:mmkv-static:1.3.3") implementation("com.google.code.gson:gson:2.10.1") @@ -113,10 +119,10 @@ dependencies { implementation("com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar") implementation("com.github.jorgecastilloprz:fabprogresscircle:1.01@aar") implementation("me.drakeet.support:toastcompat:1.1.0") - implementation("com.blacksquircle.ui:editorkit:2.8.0") - implementation("com.blacksquircle.ui:language-base:2.8.0") - implementation("com.blacksquircle.ui:language-json:2.8.0") - implementation("io.github.g00fy2.quickie:quickie-bundled:1.6.0") + implementation("com.blacksquircle.ui:editorkit:2.9.0") + implementation("com.blacksquircle.ui:language-base:2.9.0") + implementation("com.blacksquircle.ui:language-json:2.9.0") + implementation("io.github.g00fy2.quickie:quickie-bundled:1.9.0") implementation("com.google.zxing:core:3.5.3") implementation("androidx.work:work-runtime-ktx:2.8.1") diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt index 6145137b1..46d37283e 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ScannerActivity.kt @@ -45,7 +45,7 @@ class ScannerActivity : BaseActivity(){ private fun handleResult(result: QRResult) { if (result is QRResult.QRSuccess ) { - finished(result.content.rawValue) + finished(result.content.rawValue!!) } else { finish() } diff --git a/V2rayNG/build.gradle.kts b/V2rayNG/build.gradle.kts index 68a203793..2d2e53955 100644 --- a/V2rayNG/build.gradle.kts +++ b/V2rayNG/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "7.4.2" apply false - id("com.android.library") version "7.4.2" apply false - id("org.jetbrains.kotlin.android") version "1.8.0" apply false + id("com.android.application") version "8.2.2" apply false + id("com.android.library") version "8.2.2" apply false + id("org.jetbrains.kotlin.android") version "1.9.22" apply false } \ No newline at end of file diff --git a/V2rayNG/gradle/wrapper/gradle-wrapper.properties b/V2rayNG/gradle/wrapper/gradle-wrapper.properties index cc8f2bd59..118c9f961 100644 --- a/V2rayNG/gradle/wrapper/gradle-wrapper.properties +++ b/V2rayNG/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip