diff --git a/metadata/io.nekohasekai.sagernet.yml b/metadata/io.nekohasekai.sagernet.yml index 9df1b0d382..a9bf7ea3ae 100644 --- a/metadata/io.nekohasekai.sagernet.yml +++ b/metadata/io.nekohasekai.sagernet.yml @@ -212,8 +212,33 @@ Builds: - ./run fdroid build ndk: r21e + - versionName: 0.5-rc23 + versionCode: 590 + commit: 0.5-rc23 + subdir: app + sudo: + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java + patch: + - disable-splits-abi.patch + gradle: + - fdroid + prebuild: + - pushd .. + - ./run fdroid prebuild + scandelete: + - library + - external + build: + - pushd .. + - ./run fdroid build + ndk: r21e + ArchivePolicy: 12 versions -AutoUpdateMode: None -UpdateCheckMode: None -CurrentVersion: 0.2-rc03-arm64 -CurrentVersionCode: 285 +AutoUpdateMode: Version %v +UpdateCheckMode: Tags +VercodeOperation: '%c * 5' +UpdateCheckData: sager.properties|VERSION_CODE=(\d+)|| +CurrentVersion: 0.5-rc23 +CurrentVersionCode: 590 diff --git a/metadata/io.nekohasekai.sagernet/disable-splits-abi.patch b/metadata/io.nekohasekai.sagernet/disable-splits-abi.patch new file mode 100644 index 0000000000..0fcc138335 --- /dev/null +++ b/metadata/io.nekohasekai.sagernet/disable-splits-abi.patch @@ -0,0 +1,42 @@ +diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt +index 440dbdf..950a3c1 100644 +--- a/buildSrc/src/main/kotlin/Helpers.kt ++++ b/buildSrc/src/main/kotlin/Helpers.kt +@@ -335,8 +335,8 @@ fun Project.setupPlugin(projectName: String) { + } + + splits.abi { +- isEnable = true +- isUniversalApk = false ++ isEnable = false ++ isUniversalApk = true + + if (targetAbi.isNotBlank()) { + reset() +@@ -347,6 +347,7 @@ fun Project.setupPlugin(projectName: String) { + flavorDimensions("vendor") + productFlavors { + create("oss") ++ create("fdroid") + create("fdroidArm64") { + versionNameSuffix = "-arm64" + } +@@ -453,8 +454,8 @@ fun Project.setupApp() { + } + + splits.abi { +- isEnable = true +- isUniversalApk = false ++ isEnable = false ++ isUniversalApk = true + + if (targetAbi.isNotBlank()) { + reset() +@@ -466,6 +467,7 @@ fun Project.setupApp() { + productFlavors { + create("oss") + create("expert") ++ create("fdroid") + create("fdroidArm64") { + versionNameSuffix = "-arm64" + }