From 2dd06ffe7edc55b25da2fef51a8536a155d32c8f Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Mon, 17 Feb 2025 20:45:49 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=AA=B2=20Debug=20Release=201.2.6=20(1?=
 =?UTF-8?q?26004)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Update Gradle
• Update Submodules
• Bump versionCode to 126004 (1.2.6)
• Update buildToolsVersion to 36.0.0-rc5
---
 .github/workflows/ci.yml                 |  6 ++---
 .github/workflows/playstore.yml          |  6 ++---
 .idea/kotlinc.xml                        |  2 +-
 app/build.gradle.kts                     | 28 ++++++++++++------------
 build.gradle.kts                         |  2 +-
 colorutilsc                              |  2 +-
 gradle/libs.versions.toml                | 20 ++++++++---------
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 rboardcomponents                         |  2 +-
 9 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4b3b80..ba5f998 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,11 +26,11 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.0'
+          cmake-version: '3.31.5'
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27c
+          ndk-version: r28
 
       - name: Get Commit Message
         id: commitMessage
@@ -98,7 +98,7 @@ jobs:
           signingKey: ${{ secrets.SIGNING_KEY }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: '36.0.0-rc1'
+          buildToolsVersion: '36.0.0-rc5'
 
       - name: List files
         run: ls app/build/outputs/apk/release
diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml
index e0c3508..8f2f4e9 100644
--- a/.github/workflows/playstore.yml
+++ b/.github/workflows/playstore.yml
@@ -24,11 +24,11 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v2
         with:
-          cmake-version: '3.31.0'
+          cmake-version: '3.31.5'
 
       - uses: nttld/setup-ndk@v1
         with:
-          ndk-version: r27c
+          ndk-version: r28
 
       - name: Setup JDK
         uses: actions/setup-java@v4
@@ -80,7 +80,7 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          BUILD_TOOLS_VERSION: '36.0.0-rc1'
+          BUILD_TOOLS_VERSION: '36.0.0-rc5'
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 17f68e0..c66c05a 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -11,6 +11,6 @@
     <option name="languageVersion" value="2.1" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.1.0-RC2" />
+    <option name="version" value="2.1.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6701268..6099845 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -10,7 +8,7 @@ plugins {
 
 android {
     compileSdkPreview = "Baklava"
-    buildToolsVersion = "36.0.0 rc1"
+    buildToolsVersion = "36.0.0 rc5"
     buildFeatures.dataBinding = true
 
     buildFeatures.viewBinding = true
@@ -22,21 +20,23 @@ android {
         applicationId = "de.dertyp7214.rboardimetester"
         minSdk = 23
         targetSdk = 35
-        versionCode = 126003
+        versionCode = 126004
         versionName = "1.2.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        resourceConfigurations += listOf(
-            "ar", "cs", "da", "de",
-            "el", "en", "es", "fi",
-            "fr", "hi", "hu", "in",
-            "it", "ja", "nl", "no",
-            "pl", "pt-rBR", "ro", "ru",
-            "sv", "uk", "vi",
-            "zh-rCN", "zh-rTW"
-        )
     }
+    @Suppress("UnstableApiUsage")
+    androidResources {
+        localeFilters += listOf(
+                "ar", "cs", "da", "de",
+                "el", "en", "es", "fi",
+                "fr", "hi", "hu", "in",
+                "it", "ja", "nl", "no",
+                "pl", "pt-rBR", "ro", "ru",
+                "sv", "uk", "vi",
+                "zh-rCN", "zh-rTW"
+            )
+        }
 
     buildTypes {
         getByName("release") {
diff --git a/build.gradle.kts b/build.gradle.kts
index d00cdb9..40495e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ buildscript {
         classpath(libs.gradle)
         classpath(libs.r8)
         //noinspection DifferentKotlinGradleVersion
-        classpath(kotlin("gradle-plugin", version = "2.1.0-RC2"))
+        classpath(kotlin("gradle-plugin", version = "2.1.10"))
     }
 }
 
diff --git a/colorutilsc b/colorutilsc
index e09008d..32e4ea9 160000
--- a/colorutilsc
+++ b/colorutilsc
@@ -1 +1 @@
-Subproject commit e09008dfe95a440f378fc213ff20815396d296e7
+Subproject commit 32e4ea92b7a91c44b9d81913c111da57c2bf3d72
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a6c363..85c7348 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,21 +2,21 @@
 appcompat = "1.7.0"
 browser = "1.8.0"
 constraintlayout = "2.2.0"
-coreKtx = "1.15.0"
+coreKtx = "1.16.0-alpha02"
 espressoCore = "3.6.1"
-gradle = "8.9.0-alpha03"
-gson = "2.11.0"
+gradle = "8.10.0-alpha05"
+gson = "2.12.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-kotlinreflect = "2.1.0-RC2"
-kotlinStdlib = "2.1.0-RC2"
-kspPlugin = "2.1.0-RC2-1.0.28"
+kotlinreflect = "2.1.10"
+kotlinStdlib = "2.1.10"
+kspPlugin = "2.1.10-1.0.30"
 legacySupportV4 = "1.0.0"
-lifecycleViewmodelKtx = "2.9.0-alpha07"
+lifecycleViewmodelKtx = "2.9.0-alpha10"
 preference-ktx = "1.2.1"
-material = "1.13.0-alpha08"
-desugar_jdk_libs_nio = "2.1.3"
-r8 = "8.8.19"
+material = "1.13.0-alpha10"
+desugar_jdk_libs_nio = "2.1.4"
+r8 = "8.9.28"
 
 [libraries]
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa189f8..bc99871 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 20 08:18:50 CET 2024
+#Wed Jan 29 10:22:20 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/rboardcomponents b/rboardcomponents
index f23f83d..7ef20ef 160000
--- a/rboardcomponents
+++ b/rboardcomponents
@@ -1 +1 @@
-Subproject commit f23f83da287e34b6f75f90639e1e115de44141fb
+Subproject commit 7ef20efd9629d3e4e74de8fc154c7bf21a8a3495

From 1b15b0da49cdd5157bc2002eadfac8237f2c457a Mon Sep 17 00:00:00 2001
From: PahaAkos <paha.akos@gmail.com>
Date: Mon, 17 Feb 2025 20:56:49 +0100
Subject: [PATCH 2/2] Fix Workflows

---
 .github/workflows/ci.yml        | 6 ++++++
 .github/workflows/playstore.yml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba5f998..d2aa36a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,12 @@ jobs:
         with:
           cmake-version: '3.31.5'
 
+      - name: Setup Ninja
+        run: sudo apt-get install ninja-build
+     
+      - name: Ninja Version
+        run: ninja --version
+
       - uses: nttld/setup-ndk@v1
         with:
           ndk-version: r28
diff --git a/.github/workflows/playstore.yml b/.github/workflows/playstore.yml
index 8f2f4e9..5560817 100644
--- a/.github/workflows/playstore.yml
+++ b/.github/workflows/playstore.yml
@@ -26,6 +26,12 @@ jobs:
         with:
           cmake-version: '3.31.5'
 
+      - name: Setup Ninja
+        run: sudo apt-get install ninja-build
+     
+      - name: Ninja Version
+        run: ninja --version
+
       - uses: nttld/setup-ndk@v1
         with:
           ndk-version: r28