diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ca5dd635..de6009820 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 38c1e939a..fb71c0f0c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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" diff --git a/settings.gradle.kts b/settings.gradle.kts index d012017a2..4dc842acd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -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"