Merge remote-tracking branch 'origin/develop'

Oztechan · Sep 26, 2021 · 01658e8 · 01658e8
2 parents 5fa219d + d93dc19
commit 01658e8
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git 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
diff --git 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
@@ -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,6 @@ 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"
+    const val WORK_RUNTIME = "2.7.0-beta01"
 }
diff --git a/...ain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt b/...ain/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,

diff --git a/logmob b/logmob
diff --git a/parsermob b/parsermob
diff --git a/scopemob b/scopemob