From 620dacd4d316af5bf256185965425048178ebc61 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Fri, 31 May 2024 20:30:30 +0200 Subject: [PATCH 1/4] Debug Release 1.2.4 (124) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔧 New dependencies changes: • Update Appcompat to 1.7.0 • Update Core(-ktx) to 1.13.1 • Update EspressoCore to 3.6.0-rc01 • Update Gradle to 8.6.0-alpha04 • Update Kotlin to 2.0.0 • Update Lifecycle-viewmodel(-ktx) to 2.8.1 • Update Material to 1.12.0 🗂️ Others Changes: • Update versionCode to 124 (1.2.4) • Update buildToolsVersion to 35.0.0-rc4 • Update Workflow Files --- .github/workflows/ci.yml | 4 ++-- .github/workflows/playstore.yml | 4 ++-- .idea/kotlinc.xml | 4 +++- app/build.gradle.kts | 6 +++--- build.gradle.kts | 2 +- gradle/libs.versions.toml | 20 ++++++++++---------- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e40555..3f5ef12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26d + ndk-version: r27-beta1 - name: Get Commit Message id: commitMessage @@ -92,7 +92,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: '35.0.0-rc3' + buildToolsVersion: '35.0.0-rc4' - name: List files run: ls app/build/outputs/apk/release diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml index acecd0b..7a58310 100644 --- a/.github/workflows/playstore.yml +++ b/.github/workflows/playstore.yml @@ -23,7 +23,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26d + ndk-version: r27-beta1 - name: Setup JDK uses: actions/setup-java@v4 @@ -74,7 +74,7 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: '35.0.0-rc3' + BUILD_TOOLS_VERSION: '35.0.0-rc4' - name: Upload Artifact uses: actions/upload-artifact@v4 diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index c18a1e6..19991cd 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,9 +1,11 @@ + - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 450f736..596fb39 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -10,7 +10,7 @@ plugins { android { compileSdkPreview = "VanillaIceCream" - buildToolsVersion = "35.0.0 rc3" + buildToolsVersion = "35.0.0 rc4" buildFeatures.dataBinding = true buildFeatures.viewBinding = true @@ -22,8 +22,8 @@ android { applicationId = "de.dertyp7214.rboardimetester" minSdk = 23 targetSdk = 34 - versionCode = 123 - versionName = "1.2.3" + versionCode = 124 + versionName = "1.2.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/build.gradle.kts b/build.gradle.kts index f430b6e..0402b73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ buildscript { dependencies { classpath(libs.gradle) //noinspection DifferentKotlinGradleVersion - classpath(kotlin("gradle-plugin", version = "1.9.23")) + classpath(kotlin("gradle-plugin", version = "2.0.0")) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 64d43c8..ff6681d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] -appcompat = "1.7.0-alpha03" +appcompat = "1.7.0" browser = "1.8.0" constraintlayout = "2.2.0-alpha13" -coreKtx = "1.13.0" -espressoCore = "3.6.0-alpha03" -gradle = "8.5.0-alpha06" -gson = "2.10.1" +coreKtx = "1.13.1" +espressoCore = "3.6.0-rc01" +gradle = "8.6.0-alpha04" +gson = "2.11.0" junit = "4.13.2" junitVersion = "1.1.5" -kotlinreflect = "1.9.23" -kotlinStdlib = "1.9.23" -kspPlugin = "1.9.23-1.0.20" +kotlinreflect = "2.0.0" +kotlinStdlib = "2.0.0" +kspPlugin = "2.0.0-1.0.21" legacySupportV4 = "1.0.0" -lifecycleViewmodelKtx = "2.8.0-beta01" +lifecycleViewmodelKtx = "2.8.1" preference-ktx = "1.2.1" -material = "1.11.0" +material = "1.12.0" desugar_jdk_libs_nio = "2.0.4" [libraries] From e1d962a1e7cc6c0a0847e4ebf4223800c09e6723 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Fri, 31 May 2024 20:33:11 +0200 Subject: [PATCH 2/4] Debug Release 1.2.4 (124001) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🗂️ Others Changes: • Update versionCode to 124001 (1.2.4) • Update Submodules --- app/build.gradle.kts | 2 +- rboardcomponents | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 596fb39..5e82e81 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,7 +22,7 @@ android { applicationId = "de.dertyp7214.rboardimetester" minSdk = 23 targetSdk = 34 - versionCode = 124 + versionCode = 124001 versionName = "1.2.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/rboardcomponents b/rboardcomponents index 4ed2d49..46caa64 160000 --- a/rboardcomponents +++ b/rboardcomponents @@ -1 +1 @@ -Subproject commit 4ed2d492b7064ecf77d75126c8eed03ecd206c97 +Subproject commit 46caa643b9c4afff9bd42ef87cb576ee11981c45 From 6b0a1df5b5e53295336b5164ec0b724a44528677 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Fri, 7 Jun 2024 21:17:11 +0200 Subject: [PATCH 3/4] Debug Release 1.2.4 (124002) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔧 New dependencies changes: • Update Gradle to 8.6.0-alpha05 • Update Kotlin to 2.0.0 🗂️ Others Changes: • Update versionCode to 124002 (1.2.4) • Update Submodules --- .github/workflows/ci.yml | 4 +- .github/workflows/playstore.yml | 4 +- .idea/compiler.xml | 2 +- .idea/gradle.xml | 2 +- .idea/kotlinc.xml | 4 +- .idea/misc.xml | 4 +- .idea/other.xml | 263 +++++++++++++++++++++++ app/build.gradle.kts | 10 +- colorutilsc | 2 +- gradle/libs.versions.toml | 4 +- gradle/wrapper/gradle-wrapper.properties | 4 +- rboardcomponents | 2 +- 12 files changed, 285 insertions(+), 20 deletions(-) create mode 100644 .idea/other.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f5ef12..7181594 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r27-beta1 + ndk-version: r27-rc1 - name: Get Commit Message id: commitMessage @@ -34,7 +34,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 22 distribution: temurin - name: Cache Gradle dependencies diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml index 7a58310..ce523d5 100644 --- a/.github/workflows/playstore.yml +++ b/.github/workflows/playstore.yml @@ -23,12 +23,12 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r27-beta1 + ndk-version: r27-rc1 - name: Setup JDK uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 22 distribution: temurin diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b86273d..6030a3d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 28181b6..acabf60 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,7 +5,7 @@