From 3f202f6b5784ed4b5b007961f519df88ca86582e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 17 Feb 2023 12:28:03 +0100 Subject: [PATCH 1/4] Upgrade AGP, and some other plugins. --- app/build.gradle.kts | 2 +- gradle/libs.versions.toml | 9 +++++---- plugins/src/main/kotlin/extension/CommonExtension.kt | 2 +- .../src/main/kotlin/extension/DependencyHandleScope.kt | 7 ++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0ee91861a0..ed7b4cdcec 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -120,7 +120,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.0" + kotlinCompilerExtensionVersion = libs.versions.composecompiler.get() } packagingOptions { resources { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 001825734c..0a0991aca5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,10 +3,10 @@ [versions] # Project -android_gradle_plugin = "7.3.1" -firebase_gradle_plugin = "3.0.2" -kotlin = "1.8.0" -ksp = "1.8.0-1.0.8" +android_gradle_plugin = "7.4.1" +firebase_gradle_plugin = "3.2.0" +kotlin = "1.8.10" +ksp = "1.8.10-1.0.9" molecule = "0.7.0" # AndroidX @@ -21,6 +21,7 @@ startup = "1.1.1" # Compose compose_bom = "2023.01.00" +composecompiler = "1.4.2" # Coroutines coroutines = "1.6.4" diff --git a/plugins/src/main/kotlin/extension/CommonExtension.kt b/plugins/src/main/kotlin/extension/CommonExtension.kt index 5fdb80ba1a..f5724b2e72 100644 --- a/plugins/src/main/kotlin/extension/CommonExtension.kt +++ b/plugins/src/main/kotlin/extension/CommonExtension.kt @@ -50,7 +50,7 @@ fun CommonExtension<*, *, *, *>.composeConfig() { } composeOptions { - kotlinCompilerExtensionVersion = "1.4.0" + kotlinCompilerExtensionVersion = "1.4.2" // libs.versions.composecompiler.get() } packagingOptions { diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt index 731a00042f..de65b65796 100644 --- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt +++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt @@ -16,9 +16,9 @@ package extension -import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.androidTestImplementation -import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplementation -import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation +import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.androidTestImplementation +import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.debugImplementation +import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.implementation import org.gradle.kotlin.dsl.DependencyHandlerScope import org.gradle.kotlin.dsl.project @@ -33,6 +33,7 @@ fun DependencyHandlerScope.commonDependencies() { * Dependencies used by all the modules with composable items */ fun DependencyHandlerScope.composeDependencies() { + // TODO Find a way to use androidx_compose_bom val composeBom = platform("androidx.compose:compose-bom:2023.01.00") implementation(composeBom) androidTestImplementation(composeBom) From 7ddf57da8bd6b5ea00623e9906e40fb14953c46e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 17 Feb 2023 14:00:34 +0100 Subject: [PATCH 2/4] Also upgrade com.android.tools:desugar_jdk_libs (was waiting for AGP upgrade) --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ed7b4cdcec..7b8f71184f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -167,7 +167,7 @@ dependencies { anvil(projects.anvilcodegen) // https://developer.android.com/studio/write/java8-support#library-desugaring-versions - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2") implementation(libs.appyx.core) implementation(libs.androidx.splash) implementation(libs.androidx.corektx) From 96198dbe863256bda07e370bfcf5d030efecba5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 23:05:21 +0000 Subject: [PATCH 3/4] Bump mobile-dev-inc/action-maestro-cloud from 1.2.3 to 1.3.1 Bumps [mobile-dev-inc/action-maestro-cloud](https://github.com/mobile-dev-inc/action-maestro-cloud) from 1.2.3 to 1.3.1. - [Release notes](https://github.com/mobile-dev-inc/action-maestro-cloud/releases) - [Commits](https://github.com/mobile-dev-inc/action-maestro-cloud/compare/v1.2.3...v1.3.1) --- updated-dependencies: - dependency-name: mobile-dev-inc/action-maestro-cloud dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/maestro.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maestro.yml b/.github/workflows/maestro.yml index 486094760e..f9921a88fa 100644 --- a/.github/workflows/maestro.yml +++ b/.github/workflows/maestro.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v3 - name: Assemble debug APK run: ./gradlew assembleDebug $CI_GRADLE_ARG_PROPERTIES - - uses: mobile-dev-inc/action-maestro-cloud@v1.2.3 + - uses: mobile-dev-inc/action-maestro-cloud@v1.3.1 with: api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }} app-file: app/build/outputs/apk/debug/app-debug.apk From fd94874b59de0e45165bf18965a6fffa7525ea00 Mon Sep 17 00:00:00 2001 From: bmarty Date: Sat, 25 Feb 2023 06:06:00 +0000 Subject: [PATCH 4/4] Import strings from Element Android --- libraries/ui-strings/src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/ui-strings/src/main/res/values/strings.xml b/libraries/ui-strings/src/main/res/values/strings.xml index e06355a173..2ee623cf88 100644 --- a/libraries/ui-strings/src/main/res/values/strings.xml +++ b/libraries/ui-strings/src/main/res/values/strings.xml @@ -862,6 +862,8 @@ Keywords cannot start with \'.\' Keywords cannot contain \'%s\' + An error occurred when updating your notification preferences. Please try again. + Troubleshoot Notifications Troubleshooting diagnostics Run Tests