From eccfe28955518d04278207126eda07afc7c48d74 Mon Sep 17 00:00:00 2001 From: AkosPaha Date: Wed, 8 Feb 2023 19:58:44 +0100 Subject: [PATCH] SDK UpsideDownCake Preview --- .github/workflows/buildCi.yml | 6 +++--- .github/workflows/buildPro.yml | 2 +- app/build.gradle.kts | 8 ++++---- build.gradle.kts | 2 +- colorutilsc | 2 +- mathc | 2 +- rboardcomponents | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml index 34504dbb..07bcce82 100644 --- a/.github/workflows/buildCi.yml +++ b/.github/workflows/buildCi.yml @@ -90,7 +90,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.1 + buildToolsVersion: "34.0.0-rc1" - name: Delete old APK run: rm app/build/outputs/apk/debug/app-debug.apk @@ -218,7 +218,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.1 + buildToolsVersion: "34.0.0-rc1" - name: Rename APK run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk app/build/outputs/apk/release/app-release.apk @@ -349,7 +349,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.1 + buildToolsVersion: "34.0.0-rc1" - name: Rename APK run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml index 26ccc668..db454821 100644 --- a/.github/workflows/buildPro.yml +++ b/.github/workflows/buildPro.yml @@ -79,7 +79,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 33.0.1 + buildToolsVersion: "34.0.0-rc1" - name: List files run: ls app/build/outputs/apk/pro diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 888413c7..83d687c0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,8 +14,8 @@ val kotlinVersion: String = project.getKotlinPluginVersion() @Suppress("UnstableApiUsage") android { - compileSdk = 33 - buildToolsVersion = "33.0.1" + compileSdkPreview = "UpsideDownCake" + buildToolsVersion = "34.0.0-rc1" buildFeatures.dataBinding = true buildFeatures.viewBinding = true buildFeatures.buildConfig = true @@ -99,7 +99,7 @@ dependencies { implementation("dev.chrisbanes.insetter:insetter:0.6.1") implementation("androidx.core:core-ktx:1.10.0-alpha02") //noinspection DifferentStdlibGradleVersion - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.10") 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") @@ -124,5 +124,5 @@ dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar")))) debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-alpha05") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.10") } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index f9595e99..b5f348eb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ buildscript { maven("https://oss.sonatype.org/content/repositories/snapshots/") } dependencies { - classpath("com.android.tools.build:gradle:8.1.0-alpha02") + classpath("com.android.tools.build:gradle:8.1.0-alpha03") //noinspection DifferentKotlinGradleVersion classpath(kotlin("gradle-plugin", version = "1.8.0")) classpath("com.google.gms:google-services:4.3.15") diff --git a/colorutilsc b/colorutilsc index 762519af..9e00b35f 160000 --- a/colorutilsc +++ b/colorutilsc @@ -1 +1 @@ -Subproject commit 762519af36dd1b565a9386b558070e4954fdaf66 +Subproject commit 9e00b35f8fbd46fe0665f59c3259af86b6b4830d diff --git a/mathc b/mathc index 83112323..b4e00548 160000 --- a/mathc +++ b/mathc @@ -1 +1 @@ -Subproject commit 8311232312e3eb8f0987944fa31d48b1e09f5287 +Subproject commit b4e00548de1e78a15c70eda9ebb795a46f21c550 diff --git a/rboardcomponents b/rboardcomponents index d8a387b0..47b34de9 160000 --- a/rboardcomponents +++ b/rboardcomponents @@ -1 +1 @@ -Subproject commit d8a387b0c3e89ec470ea06fc0d0906f5f0296861 +Subproject commit 47b34de92190356d57d0739bc83ed732202459a2