diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45a5431..5340d8d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r26c - name: Get Commit Message id: commitMessage @@ -69,7 +69,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: gradle-version: wrapper arguments: assembleRelease @@ -92,7 +92,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.0 + buildToolsVersion: 35.0.0-rc1 - name: List files run: ls app/build/outputs/apk/release diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml index db4ff8b..1fdca10 100644 --- a/.github/workflows/playstore.yml +++ b/.github/workflows/playstore.yml @@ -23,7 +23,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r26c - name: Setup JDK uses: actions/setup-java@v4 @@ -58,7 +58,7 @@ jobs: - name: Build Bundle id: buildBundle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: gradle-version: wrapper arguments: bundleRelease @@ -73,10 +73,10 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: 34.0.0 + BUILD_TOOLS_VERSION: 35.0.0-rc1 - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Artifact path: app/build/outputs/bundle/release/app-release.aab diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e7cb77e..5fcf846 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,8 +9,8 @@ plugins { android { namespace = "de.dertyp7214.rboardpatcher" - compileSdk = 34 - buildToolsVersion = "34.0.0" + compileSdkPreview = "VanillaIceCream" + buildToolsVersion = "35.0.0 rc1" buildFeatures.buildConfig = true @@ -18,7 +18,7 @@ android { applicationId = "de.dertyp7214.rboardpatcher" minSdk = 23 targetSdk = 34 - versionCode = 3200 + versionCode = 3201 versionName = "3.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f06095f..4a07f95 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,12 +6,12 @@ constraintlayout = "2.1.4" coreKtx = "1.12.0" desugar_jdk_libs_nio = "2.0.4" espressoCore = "3.5.1" -gradle = "8.4.0-alpha07" +gradle = "8.4.0-alpha10" gson = "2.10.1" junit = "4.13.2" kotlinreflect = "1.9.22" kotlinStdlib = "1.9.22" -kotlinxCoroutinesAndroid = "1.7.3" +kotlinxCoroutinesAndroid = "1.8.0" kspPlugin = "1.9.22-1.0.17" material = "1.11.0" preferenceKtx = "1.2.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea0fff0..10b1068 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 12 22:48:52 CET 2024 +#Fri Feb 16 21:57:43 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists