diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6ef3465..253e9d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - val javaVersion = JavaVersion.VERSION_1_8 + val javaVersion = JavaVersion.VERSION_17 compileSdk = 35 compileOptions { sourceCompatibility = javaVersion @@ -15,11 +15,11 @@ android { kotlinOptions.jvmTarget = javaVersion.toString() namespace = "com.github.shadowsocks.plugin.v2ray" defaultConfig { - minSdk = 23 + minSdk = 26 targetSdk = 35 - versionCode = 1030300 - versionName = "1.3.3" - testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" + versionCode = 1030500 + versionName = "1.3.5" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { getByName("release") { @@ -37,6 +37,11 @@ android { sourceSets.getByName("main").jniLibs.srcDirs(files("$projectDir/build/go")) ndkVersion = "27.2.12479018" packagingOptions.jniLibs.useLegacyPackaging = true + externalNativeBuild { + ndkBuild { + ndkVersion = "27.2.12479018" + } + } } tasks.register("goBuild") { @@ -62,6 +67,6 @@ dependencies { implementation("com.github.shadowsocks:plugin:2.0.1") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test:runner:1.6.2") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") + androidTestImplementation("androidx.test:runner:1.7.0") + androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") } diff --git a/app/go-build.bash b/app/go-build.bash index c7a2a54..6ae7336 100644 --- a/app/go-build.bash +++ b/app/go-build.bash @@ -20,6 +20,7 @@ for i in "${!ABIS[@]}"; do && env \ CGO_ENABLED=1 CC="${TOOLCHAIN}/${CLANG_ARCHS[$i]}${MIN_API}-clang" \ GOOS=android GOARCH=${GO_ARCHS[$i]} \ + GOFLAGS="-mod=mod" \ go build -v -ldflags='-s -w' -o "${OUT_DIR}/unstripped" \ && "${TOOLCHAIN}/llvm-strip" "${OUT_DIR}/unstripped" -o "${OUT_DIR}/${ABI}/${BIN}" \ || exit -1 diff --git a/build.gradle.kts b/build.gradle.kts index d096c4c..8834102 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.ben-manes.versions") version "0.51.0" + id("com.github.ben-manes.versions") version "0.52.0" } buildscript { @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.7.2") + classpath("com.android.tools.build:gradle:8.9.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21") } } diff --git a/gradle.properties b/gradle.properties index dff53dd..23c9085 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,6 @@ # The setting is particularly useful for tweaking memory settings. android.enableJetifier=true android.enableR8.fullMode=true -android.enableResourceOptimizations=false android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME