From bf17f5ad4494d2f613eecd2cffeb9c1fbcc43745 Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Sat, 25 Sep 2021 17:17:36 +0200 Subject: [PATCH 1/3] kotlin & library updates --- buildSrc/src/main/kotlin/Versions.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ecf74089a2..25427c0051 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,24 +4,24 @@ @Suppress("SpellCheckingInspection") object Versions { - const val KOTLIN = "1.5.30" + const val KOTLIN = "1.5.31" const val ANDROID_GRADLE_PLUGIN = "7.1.0-alpha12" const val ANDROID_MATERIAL = "1.4.0" - const val CONSTRAINT_LAYOUT = "2.1.0" + const val CONSTRAINT_LAYOUT = "2.1.1" const val KTOR = "1.6.3" const val LOG_BACK = "1.3.0-alpha10" const val KOIN = "3.1.2" const val KERMIT = "0.1.9" - const val MULTIPLATFORM_SETTINGS = "0.8" + const val MULTIPLATFORM_SETTINGS = "0.8.1" const val FIREBASE_CORE = "19.0.1" const val FIREBASE_CRASHLYTICS = "18.2.1" const val DESUGARING = "1.1.5" const val ANR_WATCH_DOG = "1.4.0" const val GSM = "4.3.10" const val CRASHLYTICS = "2.7.1" - const val ADMOB = "20.3.0" + const val ADMOB = "20.4.0" const val NAVIGATION = "2.3.5" - const val PLAY_CORE = "1.10.1" + const val PLAY_CORE = "1.10.2" const val KOTLIN_X_DATE_TIME = "0.2.1" const val COROUTINES = "1.5.2-native-mt" const val BILLING = "4.0.0" @@ -31,5 +31,5 @@ object Versions { const val MOKO_RESOURCES = "0.17.2" const val DEPENDENCY_UPDATES = "0.39.0" const val BUILD_HEALTH = "0.78.0" - const val BUILD_KONFIG = "0.9.0" + const val BUILD_KONFIG = "0.10.1" } From 97a75ee4e1d70925e518e13e1072329d758ef2d2 Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Sat, 25 Sep 2021 17:33:02 +0200 Subject: [PATCH 2/3] double api call fix --- .../ccc/client/viewmodel/calculator/CalculatorViewModel.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/commonMain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt b/client/src/commonMain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt index d2977f6b96..3937336ce5 100755 --- a/client/src/commonMain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt +++ b/client/src/commonMain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt @@ -148,7 +148,6 @@ class CalculatorViewModel( private fun currentBaseChanged(newBase: String) { data.rates = null settingsRepository.currentBase = newBase - calculateOutput(_state.value.input) _state.update( base = newBase, input = _state.value.input, From d93dc19e915d04fde67dfa92e69c4f33d40afc8b Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Sun, 26 Sep 2021 12:40:03 +0200 Subject: [PATCH 3/3] android 12 app crash fix --- android/build.gradle.kts | 1 + basemob | 2 +- buildSrc/src/main/kotlin/Dependencies.kt | 1 + buildSrc/src/main/kotlin/Versions.kt | 1 + logmob | 2 +- parsermob | 2 +- scopemob | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 794b9ae015..6df086cb17 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -136,6 +136,7 @@ dependencies { implementation(PLAY_CORE) implementation(KOIN_ANDROID) implementation(LIFECYCLE_RUNTIME) + implementation(WORK_RUNTIME) // android 12 crash fix coreLibraryDesugaring(DESUGARING) debugImplementation(LEAK_CANARY) } diff --git a/basemob b/basemob index 36ea7b9aca..5d737115cd 160000 --- a/basemob +++ b/basemob @@ -1 +1 @@ -Subproject commit 36ea7b9acaab0b90dc247cc6caedf5eb60817b8e +Subproject commit 5d737115cdd88105b1b68c5466cc92187ee99e15 diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 1aa48c45dd..c36b1c8004 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -45,6 +45,7 @@ object Dependencies { const val SQL_DELIGHT = "com.squareup.sqldelight:android-driver:${Versions.SQL_DELIGHT}" const val BILLING = "com.android.billingclient:billing:${Versions.BILLING}" const val LEAK_CANARY = "com.squareup.leakcanary:leakcanary-android:${Versions.LEAK_CANARY}" + const val WORK_RUNTIME = "androidx.work:work-runtime:${Versions.WORK_RUNTIME}" } object IOS { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 25427c0051..6f7d6c1ec9 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -32,4 +32,5 @@ object Versions { const val DEPENDENCY_UPDATES = "0.39.0" const val BUILD_HEALTH = "0.78.0" const val BUILD_KONFIG = "0.10.1" + const val WORK_RUNTIME = "2.7.0-beta01" } diff --git a/logmob b/logmob index 44f336c414..f991e6275c 160000 --- a/logmob +++ b/logmob @@ -1 +1 @@ -Subproject commit 44f336c414bd78c3bc1a4cd1e657fa858019b649 +Subproject commit f991e6275c8c4fef50a1e41af4dfe40e9db462a7 diff --git a/parsermob b/parsermob index e4f368612d..129a3d8101 160000 --- a/parsermob +++ b/parsermob @@ -1 +1 @@ -Subproject commit e4f368612d02a7e7c4a16478b3accddbc0cc3742 +Subproject commit 129a3d810186b83c7d9c87de391c6c76a781a051 diff --git a/scopemob b/scopemob index d3c2c8fd81..2ecb9eef6d 160000 --- a/scopemob +++ b/scopemob @@ -1 +1 @@ -Subproject commit d3c2c8fd8165582b8ad34e6096752c02819fae37 +Subproject commit 2ecb9eef6d1c44aa971e9a756304547376dc052b