Migrate to settings plugin and update NDK to r27c

This commit is contained in:
FooIbar committed 2024-10-29 15:27:08 +08:00
1 parent bc5032b2d0
commit 672b53d8a9
3 files changed
+14 -8

No files matched your search

+2 -2
View File
@@ -79,7 +79,7 @@ jobs:
uses: actions/cache@v4
with:
path: app/.cxx
key: cmake-default-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
key: cmake-default-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
restore-keys: cmake-default-
- name: Build
@@ -147,7 +147,7 @@ jobs:
uses: actions/cache@v4
with:
path: app/.cxx
key: cmake-marshmallow-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
key: cmake-marshmallow-${{ hashFiles('settings.gradle.kts', 'app/src/main/cpp/CMakeLists.txt', 'app/src/main/rust/Cargo.lock') }}
restore-keys: cmake-marshmallow-
- name: Build
-6
View File
@@ -21,10 +21,6 @@ plugins {
val supportedAbis = arrayOf("arm64-v8a", "x86_64", "armeabi-v7a")
android {
compileSdk = 35
buildToolsVersion = "35.0.0"
ndkVersion = "27.1.12297006"
androidResources {
generateLocaleConfig = true
localeFilters += listOf(
@@ -82,8 +78,6 @@ android {
defaultConfig {
applicationId = "moe.tarsin.ehviewer"
minSdk = 26
targetSdk = 35
versionCode = 180060
versionName = "1.13.0"
versionNameSuffix = "-SNAPSHOT"
+12
View File
@@ -15,6 +15,18 @@ dependencyResolutionManagement {
}
}
plugins {
id("com.android.settings") version "8.8.0-alpha08"
}
android {
compileSdk = 35
minSdk = 26
targetSdk = 35
ndkVersion = "27.2.12479018"
buildToolsVersion = "35.0.0"
}
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
rootProject.name = "EhViewer"