Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

android {
val javaVersion = JavaVersion.VERSION_1_8
val javaVersion = JavaVersion.VERSION_17
compileSdk = 35
compileOptions {
sourceCompatibility = javaVersion
Expand All @@ -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") {
Expand All @@ -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<Exec>("goBuild") {
Expand All @@ -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")
}
1 change: 1 addition & 0 deletions app/go-build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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")
}
}
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down