Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@ jobs:
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.31.0'
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: r27c
ndk-version: r28

- name: Get Commit Message
id: commitMessage
Expand Down Expand Up @@ -98,7 +104,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
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/playstore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,17 @@ jobs:
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v2
with:
cmake-version: '3.31.0'
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: r27c
ndk-version: r28

- name: Setup JDK
uses: actions/setup-java@v4
Expand Down Expand Up @@ -80,7 +86,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
Expand Down
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.config.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("com.android.application")
kotlin("android")
Expand All @@ -10,7 +8,7 @@ plugins {

android {
compileSdkPreview = "Baklava"
buildToolsVersion = "36.0.0 rc1"
buildToolsVersion = "36.0.0 rc5"
buildFeatures.dataBinding = true

buildFeatures.viewBinding = true
Expand All @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion colorutilsc
Submodule colorutilsc updated 1 files
+2 −2 build.gradle
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading