Skip to content

Commit

Permalink
Monthly Update
Browse files Browse the repository at this point in the history
New dependencies changes:
• Update androidx.core:core-ktx to 1.13.0-alpha02
• Update androidx.core:core to 1.13.0-alpha02
• Update androidx.activity:activity-ktx to 1.9.0-alpha01
• Update androidx.browser:browser to 1.8.0-alpha01
• Update androidx.compose.ui:ui-tooling to 1.6.0-beta02
• Update androidx.fragment:fragment-ktx to 1.7.0-alpha07
• Update com.android.tools.build:gradle to 8.3.0-alpha16
• Update com.github.skydoves:balloon to 1.6.4-SNAPSHOT
• Update com.google.firebase:firebase-bom to 32.6.0
• Update com.google.devtools.ksp to 1.9.21-1.0.15
• Update org.jetbrains.kotlin:kotlin-gradle-plugin to 1.9.21
• Update org.jetbrains.kotlin:kotlin-reflect to 1.9.21
• Update org.jetbrains.kotlin:kotlin-stdlib to 1.9.21
• Update androidx.test.ext:junit to 1.2.0-alpha02
• Update androidx.test.espresso:espresso-core to 3.6.0-alpha02

Others Changes:
• Fix Rboard Patcher crash on older Androids
• Fix Rboard Patcher can't open theme on older Androids
• Update Portuguese Translation
• Update versionCode to 391008
• Update gradle-plugin to 1.9.21
• Update Kotlin to 1.9.21
  • Loading branch information
AkosPaha01 authored Dec 1, 2023
2 parents a75123c + 2838b29 commit 963bbfa
Show file tree
Hide file tree
Showing 15 changed files with 255 additions and 184 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/buildCi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.4.1
- uses: nttld/setup-ndk@v1.4.2
with:
ndk-version: r26b

Expand All @@ -29,10 +29,10 @@ jobs:
run: IN="${{ github.event.head_commit.message }}" && echo "message=${IN%%$'\n'*}" >> $GITHUB_OUTPUT

- name: Setup JDK
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: temurin
java-version: 20
java-version: 21

- name: Cache Gradle dependencies
uses: actions/cache@v3.3.2
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.9.0
uses: gradle/gradle-build-action@v2.10.0
with:
gradle-version: wrapper
arguments: assembleDebug
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.4.1
- uses: nttld/setup-ndk@v1.4.2
with:
ndk-version: r26b

Expand All @@ -153,10 +153,10 @@ jobs:
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: temurin
java-version: 20
java-version: 21

- name: Cache Gradle dependencies
uses: actions/cache@v3.3.2
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.9.0
uses: gradle/gradle-build-action@v2.10.0
with:
gradle-version: wrapper
arguments: assembleRelease
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.4.1
- uses: nttld/setup-ndk@v1.4.2
with:
ndk-version: r26b

Expand All @@ -283,10 +283,10 @@ jobs:
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: temurin
java-version: 20
java-version: 21

- name: Cache Gradle dependencies
uses: actions/cache@v3.3.2
Expand Down Expand Up @@ -321,7 +321,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.9.0
uses: gradle/gradle-build-action@v2.10.0
with:
gradle-version: wrapper
arguments: assembleDebug
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/buildPro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.4.1
- uses: nttld/setup-ndk@v1.4.2
with:
ndk-version: r26b

Expand All @@ -22,10 +22,10 @@ jobs:
run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}"

- name: Setup JDK
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: temurin
java-version: 20
java-version: 21

- name: Cache Gradle dependencies
uses: actions/cache@v3.3.2
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.9.0
uses: gradle/gradle-build-action@v2.10.0
with:
gradle-version: wrapper
arguments: assemblePro
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
with:
submodules: recursive

- uses: nttld/setup-ndk@v1.4.1
- uses: nttld/setup-ndk@v1.4.2
with:
ndk-version: r26b

- name: Setup JDK
uses: actions/setup-java@v3.13.0
uses: actions/setup-java@v4.0.0
with:
distribution: temurin
java-version: 20
java-version: 21

- name: Cache Gradle dependencies
uses: actions/cache@v3.3.2
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

- name: Build apk
id: buildAllApks
uses: gradle/gradle-build-action@v2.9.0
uses: gradle/gradle-build-action@v2.10.0
with:
gradle-version: wrapper
wrapper-cache-enabled: true
Expand Down
2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

2 changes: 1 addition & 1 deletion .idea/gradle.xml

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

8 changes: 2 additions & 6 deletions .idea/kotlinc.xml

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

48 changes: 47 additions & 1 deletion .idea/misc.xml

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

6 changes: 6 additions & 0 deletions .idea/other.xml

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

10 changes: 5 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {
// Update the minSdk if old Android Versions are no longer supported on the Gboard side.
minSdk = 23
targetSdk = 34
versionCode = 391007
versionCode = 391008
versionName = "3.9.1"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -51,12 +51,12 @@ android {
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_20
targetCompatibility = JavaVersion.VERSION_20
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

kotlinOptions {
jvmTarget = JvmTarget.JVM_20.description
jvmTarget = JvmTarget.JVM_21.description
freeCompilerArgs += listOf(
"-P",
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
Expand All @@ -65,7 +65,7 @@ android {

tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = JvmTarget.JVM_20.description
jvmTarget = JvmTarget.JVM_21.description
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package de.dertyp7214.rboardthememanager.core

import android.content.Context
import android.graphics.BitmapFactory
import android.os.Build
import com.dertyp7214.logs.helpers.Logger
import com.google.gson.Gson
import com.topjohnwu.superuser.io.SuFile
Expand All @@ -25,9 +26,17 @@ fun ThemeDataClass.delete(): Boolean {

fun ThemeDataClass.moveToCache(context: Context): ThemeDataClass {
val zip = SuFile(path)
val newZip = SuFile(context.cacheDir, zip.name)
val newZip = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
SuFile(context.cacheDir, zip.name)
} else {
SuFile(context.externalCacheDir, zip.name)
}
val imageFile = SuFile(path.removeSuffix(".zip"))
val newImage = SuFile(context.cacheDir, imageFile.name)
val newImage = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
SuFile(context.cacheDir, imageFile.name)
} else {
SuFile(context.externalCacheDir, imageFile.name)
}
zip.copy(newZip)
if (imageFile.exists()) imageFile.copy(newImage)
return ThemeDataClass(image, name, newZip.absolutePath)
Expand All @@ -54,7 +63,11 @@ fun ThemeDataClass.install(overrideTheme: Boolean = true, recycle: Boolean = fal
}

fun ThemeDataClass.toRboardTheme(context: Context): RboardTheme {
val tmpPath = File(context.cacheDir, "rboard")
val tmpPath = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
File(context.cacheDir, "rboard")
} else {
File(context.externalCacheDir, "rboard")
}
if (!tmpPath.exists()) tmpPath.mkdirs()

listOf(
Expand Down
Loading

0 comments on commit 963bbfa

Please sign in to comment.