diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml index ac6965ec..34504dbb 100644 --- a/.github/workflows/buildCi.yml +++ b/.github/workflows/buildCi.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: submodules: recursive @@ -35,7 +35,7 @@ jobs: java-version: 17 - name: Cache Gradle dependencies - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 if: ${{ false }} with: path: | @@ -46,7 +46,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 with: path: | ${{ github.workspace }}/.ccache @@ -99,7 +99,7 @@ jobs: run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk @@ -144,7 +144,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: submodules: recursive @@ -163,7 +163,7 @@ jobs: java-version: 17 - name: Cache Gradle dependencies - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 if: ${{ false }} with: path: | @@ -174,7 +174,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 with: path: | ${{ github.workspace }}/.ccache @@ -224,7 +224,7 @@ jobs: run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk app/build/outputs/apk/release/app-release.apk - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: Debug Artifact path: app/build/outputs/apk/release/app-release.apk @@ -274,7 +274,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: submodules: recursive @@ -293,7 +293,7 @@ jobs: java-version: 17 - name: Cache Gradle dependencies - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 if: ${{ false }} with: path: | @@ -304,7 +304,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 with: path: | ${{ github.workspace }}/.ccache @@ -355,7 +355,7 @@ jobs: run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml index 4afe2fa8..26ccc668 100644 --- a/.github/workflows/buildPro.yml +++ b/.github/workflows/buildPro.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: submodules: recursive @@ -28,7 +28,7 @@ jobs: java-version: 17 - name: Cache Gradle dependencies - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 with: path: | ~/.gradle/caches @@ -88,7 +88,7 @@ jobs: run: mv app/build/outputs/apk/pro/app-pro-unsigned-signed.apk app/build/outputs/apk/pro/app-pro.apk - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: Release Artifact path: app/build/outputs/apk/pro/app-pro.apk diff --git a/.github/workflows/createPullRequest.yml b/.github/workflows/createPullRequest.yml index 6ad2ea8f..241d1ce4 100644 --- a/.github/workflows/createPullRequest.yml +++ b/.github/workflows/createPullRequest.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: submodules: recursive fetch-depth: 0 diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 637b0a99..1f7aaa5c 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: submodules: recursive @@ -25,7 +25,7 @@ jobs: java-version: 17 - name: Cache Gradle dependencies - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 with: path: | ~/.gradle/caches @@ -35,7 +35,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.4 with: path: | ${{ github.workspace }}/.ccache @@ -69,7 +69,7 @@ jobs: echo "::set-output name=json::$content" - name: Upload Artifact - uses: actions/upload-artifact@v3.1.1 + uses: actions/upload-artifact@v3.1.2 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk diff --git a/.gitmodules b/.gitmodules index 7a11f288..a1661a63 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "mathc"] path = mathc url = https://github.com/DerTyp7214/MathC.git -[submodule "colorutilsc"] - path = colorutilsc - url = https://github.com/DerTyp7214/ColorUtilsC.git [submodule "rboardcomponents"] path = rboardcomponents url = https://github.com/DerTyp7214/RboardComponents.git +[submodule "colorutilsc"] + path = colorutilsc + url = https://github.com/DerTyp7214/ColorUtilsC.git diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 79d6a57d..888413c7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -24,7 +24,7 @@ android { applicationId = "de.dertyp7214.rboardthememanager" minSdk = 23 targetSdk = 33 - versionCode = 376100 + versionCode = 376200 versionName = "3.7.6" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -80,7 +80,7 @@ dependencies { implementation(project(":mathc")) implementation(project(":rboardcomponents")) - implementation(platform("com.google.firebase:firebase-bom:31.1.1")) + implementation(platform("com.google.firebase:firebase-bom:31.2.0")) implementation("com.google.firebase:firebase-messaging-ktx:23.1.1") implementation("com.google.firebase:firebase-analytics-ktx:21.2.0") @@ -97,14 +97,14 @@ dependencies { implementation("com.github.topjohnwu.libsu:io:$libsuVersion") implementation("com.github.topjohnwu.libsu:nio:$libsuVersion") implementation("dev.chrisbanes.insetter:insetter:0.6.1") - implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.core:core-ktx:1.10.0-alpha02") //noinspection DifferentStdlibGradleVersion implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.0") - implementation("androidx.core:core:1.9.0") - implementation("com.google.android.material:material:1.8.0-rc01") - implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha05") + implementation("androidx.core:core:1.10.0-alpha02") + implementation("com.google.android.material:material:1.9.0-alpha01") + implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha06") implementation("androidx.preference:preference-ktx:1.2.0") - implementation("androidx.activity:activity-ktx:1.7.0-alpha03") + implementation("androidx.activity:activity-ktx:1.7.0-alpha04") implementation("androidx.fragment:fragment-ktx:1.6.0-alpha04") implementation("com.jaredrummler:android-shell:1.0.0") implementation("com.google.firebase:firebase-analytics:21.2.0") @@ -123,6 +123,6 @@ dependencies { implementation("com.github.murgupluoglu:flagkit-android:1.0.2") implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar")))) - debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-alpha04") + debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-alpha05") implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0") } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a13200c0..c900e282 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -120,6 +120,13 @@ + + + + + + + diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt index cdf7fc78..7400024d 100644 --- a/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt +++ b/app/src/main/java/de/dertyp7214/rboardthememanager/utils/AppStartUp.kt @@ -420,7 +420,7 @@ class AppStartUp(private val activity: AppCompatActivity) { } val pushNotificationPermissionLauncher = - activity.registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted -> + activity.registerForActivityResult(ActivityResultContracts.RequestPermission()) { _ -> checkUpdate() } diff --git a/build.gradle.kts b/build.gradle.kts index 98d58a56..f9595e99 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,10 +11,10 @@ buildscript { maven("https://oss.sonatype.org/content/repositories/snapshots/") } dependencies { - classpath("com.android.tools.build:gradle:8.1.0-alpha01") + classpath("com.android.tools.build:gradle:8.1.0-alpha02") //noinspection DifferentKotlinGradleVersion classpath(kotlin("gradle-plugin", version = "1.8.0")) - classpath("com.google.gms:google-services:4.3.14") + classpath("com.google.gms:google-services:4.3.15") //classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.1") } }