Merge pull request #219 from icerockdev/develop

Alex009 · web-flow · commit 4ab6dee9a53c · 2022-12-19T15:41:16.000+06:00
Release 0.15.0
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
+        os: [ macos-11, windows-latest, ubuntu-latest ]
     steps:
       - uses: actions/checkout@v1
       - name: Set up JDK 11
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
+        os: [ macos-11, windows-latest, ubuntu-latest ]
     env:
       OSSRH_USER: ${{ secrets.OSSRH_USER }}
       OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
diff --git a/README.md b/README.md
@@ -50,22 +50,22 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:mvvm-core:0.14.0") // only ViewModel, EventsDispatcher, Dispatchers.UI
-    commonMainApi("dev.icerock.moko:mvvm-flow:0.14.0") // api mvvm-core, CFlow for native and binding extensions
-    commonMainApi("dev.icerock.moko:mvvm-livedata:0.14.0") // api mvvm-core, LiveData and extensions
-    commonMainApi("dev.icerock.moko:mvvm-state:0.14.0") // api mvvm-livedata, ResourceState class and extensions
-    commonMainApi("dev.icerock.moko:mvvm-livedata-resources:0.14.0") // api mvvm-core, moko-resources, extensions for LiveData with moko-resources
-    commonMainApi("dev.icerock.moko:mvvm-flow-resources:0.14.0") // api mvvm-core, moko-resources, extensions for Flow with moko-resources
+    commonMainApi("dev.icerock.moko:mvvm-core:0.15.0") // only ViewModel, EventsDispatcher, Dispatchers.UI
+    commonMainApi("dev.icerock.moko:mvvm-flow:0.15.0") // api mvvm-core, CFlow for native and binding extensions
+    commonMainApi("dev.icerock.moko:mvvm-livedata:0.15.0") // api mvvm-core, LiveData and extensions
+    commonMainApi("dev.icerock.moko:mvvm-state:0.15.0") // api mvvm-livedata, ResourceState class and extensions
+    commonMainApi("dev.icerock.moko:mvvm-livedata-resources:0.15.0") // api mvvm-core, moko-resources, extensions for LiveData with moko-resources
+    commonMainApi("dev.icerock.moko:mvvm-flow-resources:0.15.0") // api mvvm-core, moko-resources, extensions for Flow with moko-resources
     
-    androidMainApi("dev.icerock.moko:mvvm-flow-compose:0.14.0") // api mvvm-flow, binding extensions for Jetpack Compose (jvm, js, android)
-    androidMainApi("dev.icerock.moko:mvvm-livedata-compose:0.14.0") // api mvvm-livedata, binding extensions for Jetpack Compose (jvm, js, android)
-    androidMainApi("dev.icerock.moko:mvvm-livedata-material:0.14.0") // api mvvm-livedata, Material library android extensions
-    androidMainApi("dev.icerock.moko:mvvm-livedata-glide:0.14.0") // api mvvm-livedata, Glide library android extensions
-    androidMainApi("dev.icerock.moko:mvvm-livedata-swiperefresh:0.14.0") // api mvvm-livedata, SwipeRefreshLayout library android extensions
-    androidMainApi("dev.icerock.moko:mvvm-databinding:0.14.0") // api mvvm-livedata, DataBinding support for Android
-    androidMainApi("dev.icerock.moko:mvvm-viewbinding:0.14.0") // api mvvm-livedata, ViewBinding support for Android
+    androidMainApi("dev.icerock.moko:mvvm-flow-compose:0.15.0") // api mvvm-flow, binding extensions for Jetpack Compose (jvm, js, android)
+    androidMainApi("dev.icerock.moko:mvvm-livedata-compose:0.15.0") // api mvvm-livedata, binding extensions for Jetpack Compose (jvm, js, android)
+    androidMainApi("dev.icerock.moko:mvvm-livedata-material:0.15.0") // api mvvm-livedata, Material library android extensions
+    androidMainApi("dev.icerock.moko:mvvm-livedata-glide:0.15.0") // api mvvm-livedata, Glide library android extensions
+    androidMainApi("dev.icerock.moko:mvvm-livedata-swiperefresh:0.15.0") // api mvvm-livedata, SwipeRefreshLayout library android extensions
+    androidMainApi("dev.icerock.moko:mvvm-databinding:0.15.0") // api mvvm-livedata, DataBinding support for Android
+    androidMainApi("dev.icerock.moko:mvvm-viewbinding:0.15.0") // api mvvm-livedata, ViewBinding support for Android
     
-    commonTestImplementation("dev.icerock.moko:mvvm-test:0.14.0") // test utilities
+    commonTestImplementation("dev.icerock.moko:mvvm-test:0.15.0") // test utilities
 }
 ```
 
@@ -75,10 +75,10 @@ kotlin {
     // export correct artifact to use all classes of library directly from Swift
     targets.withType(org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget::class.java).all {
         binaries.withType(org.jetbrains.kotlin.gradle.plugin.mpp.Framework::class.java).all {
-            export("dev.icerock.moko:mvvm-core:0.14.0")
-            export("dev.icerock.moko:mvvm-livedata:0.14.0")
-            export("dev.icerock.moko:mvvm-livedata-resources:0.14.0")
-            export("dev.icerock.moko:mvvm-state:0.14.0")
+            export("dev.icerock.moko:mvvm-core:0.15.0")
+            export("dev.icerock.moko:mvvm-livedata:0.15.0")
+            export("dev.icerock.moko:mvvm-livedata-resources:0.15.0")
+            export("dev.icerock.moko:mvvm-state:0.15.0")
         }
     }
 }
@@ -94,7 +94,7 @@ generation enabled. All `LiveData` to `UIView` bindings is extensions for UI ele
 To use MOKO MVVM with SwiftUI set name of your kotlin framework to `MultiPlatformLibrary` and add
 dependency to CocoaPods:
 ```ruby
-pod 'mokoMvvmFlowSwiftUI', :podspec => 'https://raw.githubusercontent.com/icerockdev/moko-mvvm/release/0.14.0/mokoMvvmFlowSwiftUI.podspec'
+pod 'mokoMvvmFlowSwiftUI', :podspec => 'https://raw.githubusercontent.com/icerockdev/moko-mvvm/release/0.15.0/mokoMvvmFlowSwiftUI.podspec'
 ```
 required export of `mvvm-core` and `mvvm-flow`.
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ androidLifecycleVersion = "2.2.0"
 coroutinesVersion = "1.6.0-native-mt"
 mokoResourcesVersion = "0.18.0"
 mokoTestVersion = "0.6.1"
-mokoMvvmVersion = "0.14.0"
+mokoMvvmVersion = "0.15.0"
 mokoKSwiftVersion = "0.4.0"
 composeVersion = "1.1.1"
 composeJetBrainsVersion = "1.1.1"
@@ -41,7 +41,7 @@ androidCoreTesting = { module = "androidx.arch.core:core-testing", version = "2.
 dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlinVersion" }
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
 mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.13.0" }
-androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.0.4" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.2.2" }
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version = "1.19.0" }
 kswiftGradlePlugin = { module = "dev.icerock.moko:kswift-gradle-plugin", version.ref = "mokoKSwiftVersion" }
 composeJetBrainsGradlePlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetBrainsVersion" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mokoMvvmFlowSwiftUI.podspec b/mokoMvvmFlowSwiftUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'mokoMvvmFlowSwiftUI'
-  s.version          = '0.13.0'
+  s.version          = '0.15.0'
   s.summary          = 'MOKO MVVM SwiftUI additions for Flow'
   s.description      = 'some description here'
   s.homepage         = 'localhost'
diff --git a/mvvm-build-logic/src/main/kotlin/android-base-convention.gradle.kts b/mvvm-build-logic/src/main/kotlin/android-base-convention.gradle.kts
@@ -5,10 +5,10 @@
 import com.android.build.gradle.BaseExtension
 
 configure<BaseExtension> {
-    compileSdkVersion(30)
+    compileSdkVersion(33)
 
     defaultConfig {
-        minSdkVersion(16)
-        targetSdkVersion(30)
+        minSdk = 16
+        targetSdk = 33
     }
 }
diff --git a/mvvm-core/build.gradle.kts b/mvvm-core/build.gradle.kts
@@ -13,6 +13,6 @@ dependencies {
 
     commonMainApi(libs.coroutines)
 
-    androidMainApi(libs.appCompat)
+    androidMainApi(libs.lifecycleKtx)
     androidMainApi(libs.androidViewModel)
 }
diff --git a/mvvm-core/src/androidMain/kotlin/dev/icerock/moko/mvvm/viewmodel/ViewModel.kt b/mvvm-core/src/androidMain/kotlin/dev/icerock/moko/mvvm/viewmodel/ViewModel.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.cancel
 
 @Suppress("EmptyDefaultConstructor")
 actual open class ViewModel actual constructor() : ViewModel() {
-    protected actual val viewModelScope: CoroutineScope = createViewModelScope()
+    actual val viewModelScope: CoroutineScope = createViewModelScope()
 
     public actual override fun onCleared() {
         super.onCleared()
diff --git a/mvvm-core/src/commonMain/kotlin/dev/icerock/moko/mvvm/viewmodel/ViewModel.kt b/mvvm-core/src/commonMain/kotlin/dev/icerock/moko/mvvm/viewmodel/ViewModel.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.CoroutineScope
 
 @Suppress("EmptyDefaultConstructor")
 expect open class ViewModel() {
-    protected val viewModelScope: CoroutineScope
+    val viewModelScope: CoroutineScope
 
     open fun onCleared()
 }
diff --git a/mvvm-core/src/nonAndroidMain/kotlin/dev/icerock/moko/mvvm/viewmodel/ViewModel.kt b/mvvm-core/src/nonAndroidMain/kotlin/dev/icerock/moko/mvvm/viewmodel/ViewModel.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.cancel
 
 @Suppress("EmptyDefaultConstructor")
 actual open class ViewModel actual constructor() {
-    protected actual val viewModelScope: CoroutineScope = createViewModelScope()
+    actual val viewModelScope: CoroutineScope = createViewModelScope()
 
     actual open fun onCleared() {
         viewModelScope.cancel()
diff --git a/mvvm-flow-compose/src/commonMain/kotlin/dev/icerock/moko/mvvm/flow/compose/MutableStateAdapter.kt b/mvvm-flow-compose/src/commonMain/kotlin/dev/icerock/moko/mvvm/flow/compose/MutableStateAdapter.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.compose
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
+
+class MutableStateAdapter<T>(
+    private val state: State<T>,
+    private val mutate: (T) -> Unit
+) : MutableState<T> {
+
+    override var value: T
+        get() = state.value
+        set(value) {
+            mutate(value)
+        }
+
+    override fun component1(): T = value
+    override fun component2(): (T) -> Unit = { value = it }
+}
+
+@Composable
+fun <T> MutableStateFlow<T>.collectAsMutableState(
+    context: CoroutineContext = EmptyCoroutineContext
+): MutableState<T> = MutableStateAdapter(
+    state = collectAsState(context),
+    mutate = { value = it }
+)
diff --git a/mvvm-flow-material/build.gradle.kts b/mvvm-flow-material/build.gradle.kts
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("android-library-convention")
+    id("detekt-convention")
+    id("android-publication-convention")
+}
+
+dependencies {
+    api(projects.mvvmFlowResources)
+
+    api(libs.material)
+}
diff --git a/mvvm-flow-material/src/main/AndroidManifest.xml b/mvvm-flow-material/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="dev.icerock.moko.mvvm.flow.material" />
diff --git a/mvvm-flow-material/src/main/kotlin/dev/icerock/moko/mvvm/flow/material/TextInputLayoutBindings.kt b/mvvm-flow-material/src/main/kotlin/dev/icerock/moko/mvvm/flow/material/TextInputLayoutBindings.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.mvvm.flow.material
+
+import androidx.lifecycle.LifecycleOwner
+import com.google.android.material.textfield.TextInputLayout
+import dev.icerock.moko.mvvm.flow.CStateFlow
+import dev.icerock.moko.mvvm.flow.binding.bind
+import dev.icerock.moko.resources.desc.StringDesc
+import kotlinx.coroutines.DisposableHandle
+
+@JvmName("bindErrorString")
+fun <T : String?> TextInputLayout.bindError(
+    lifecycleOwner: LifecycleOwner,
+    flow: CStateFlow<T?>
+): DisposableHandle {
+    return flow.bind(lifecycleOwner) {
+        error = it
+        isErrorEnabled = it != null
+    }
+}
+
+@JvmName("bindErrorStringDesc")
+fun <T : StringDesc?> TextInputLayout.bindError(
+    lifecycleOwner: LifecycleOwner,
+    flow: CStateFlow<T?>
+): DisposableHandle {
+    return flow.bind(lifecycleOwner) {
+        error = it?.toString(context)
+        isErrorEnabled = it != null
+    }
+}
diff --git a/mvvm-flow/apple/xcode/mokoMvvmFlow.xcodeproj/project.pbxproj b/mvvm-flow/apple/xcode/mokoMvvmFlow.xcodeproj/project.pbxproj
@@ -117,6 +117,7 @@
 		22D5AD53281BD2F700008F57 /* mokoMvvmFlow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mokoMvvmFlow.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		22D5AD59281BD2F700008F57 /* mokoMvvmFlow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mokoMvvmFlow.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		22D5AD5B281BD2F700008F57 /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
+		455E6FFE28DF859B001DAA93 /* ViewModelStateNullable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewModelStateNullable.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -158,6 +159,7 @@
 		22BDE701281BD34C00259368 /* mokoMvvmFlowSwiftUI */ = {
 			isa = PBXGroup;
 			children = (
+				455E6FFE28DF859B001DAA93 /* ViewModelStateNullable.swift */,
 				22BDE702281BD34C00259368 /* mokoMvvmFlowSwiftUI.h */,
 				22BDE739281BD56700259368 /* CFlowExt.swift */,
 				22BDE73C281BD67C00259368 /* ViewModelObservable.swift */,
@@ -494,6 +496,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
+				OTHER_SWIFT_FLAGS = "-verify-emitted-module-interface";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.icerock.moko.mokoMvvmFlowSwiftUI;
 				PRODUCT_NAME = mokoMvvmFlowSwiftUI;
 				SDKROOT = iphoneos;
@@ -528,6 +531,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
+				OTHER_SWIFT_FLAGS = "-verify-emitted-module-interface";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.icerock.moko.mokoMvvmFlowSwiftUI;
 				PRODUCT_NAME = mokoMvvmFlowSwiftUI;
 				SDKROOT = iphoneos;
@@ -562,6 +566,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.1;
 				MARKETING_VERSION = 1.0;
+				OTHER_SWIFT_FLAGS = "-verify-emitted-module-interface";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.icerock.moko.mokoMvvmFlowSwiftUI;
 				PRODUCT_NAME = mokoMvvmFlowSwiftUI;
 				SDKROOT = macosx;
@@ -594,6 +599,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.1;
 				MARKETING_VERSION = 1.0;
+				OTHER_SWIFT_FLAGS = "-verify-emitted-module-interface";
 				PRODUCT_BUNDLE_IDENTIFIER = dev.icerock.moko.mokoMvvmFlowSwiftUI;
 				PRODUCT_NAME = mokoMvvmFlowSwiftUI;
 				SDKROOT = macosx;
@@ -676,6 +682,7 @@
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -728,6 +735,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 			};
 			name = Release;
diff --git a/mvvm-flow/apple/xcode/mokoMvvmFlow.xcodeproj/xcshareddata/xcschemes/mokoMvvmFlowSwiftUI-iOS.xcscheme b/mvvm-flow/apple/xcode/mokoMvvmFlow.xcodeproj/xcshareddata/xcschemes/mokoMvvmFlowSwiftUI-iOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "22BDE6FF281BD34C00259368"
-               BuildableName = "mokoMvvmFlowSwiftUI__iOS_.framework"
+               BuildableName = "mokoMvvmFlowSwiftUI.framework"
                BlueprintName = "mokoMvvmFlowSwiftUI (iOS)"
                ReferencedContainer = "container:mokoMvvmFlow.xcodeproj">
             </BuildableReference>
@@ -51,7 +51,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "22BDE6FF281BD34C00259368"
-            BuildableName = "mokoMvvmFlowSwiftUI__iOS_.framework"
+            BuildableName = "mokoMvvmFlowSwiftUI.framework"
             BlueprintName = "mokoMvvmFlowSwiftUI (iOS)"
             ReferencedContainer = "container:mokoMvvmFlow.xcodeproj">
          </BuildableReference>
diff --git a/mvvm-flow/apple/xcode/mokoMvvmFlow.xcodeproj/xcshareddata/xcschemes/mokoMvvmFlowSwiftUI-macOS.xcscheme b/mvvm-flow/apple/xcode/mokoMvvmFlow.xcodeproj/xcshareddata/xcschemes/mokoMvvmFlowSwiftUI-macOS.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "22BDE720281BD37100259368"
-               BuildableName = "mokoMvvmFlowSwiftUI__macOS_.framework"
+               BuildableName = "mokoMvvmFlowSwiftUI.framework"
                BlueprintName = "mokoMvvmFlowSwiftUI (macOS)"
                ReferencedContainer = "container:mokoMvvmFlow.xcodeproj">
             </BuildableReference>
@@ -51,7 +51,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "22BDE720281BD37100259368"
-            BuildableName = "mokoMvvmFlowSwiftUI__macOS_.framework"
+            BuildableName = "mokoMvvmFlowSwiftUI.framework"
             BlueprintName = "mokoMvvmFlowSwiftUI (macOS)"
             ReferencedContainer = "container:mokoMvvmFlow.xcodeproj">
          </BuildableReference>
diff --git a/mvvm-flow/apple/xcode/mokoMvvmFlowSwiftUI/ViewModelState.swift b/mvvm-flow/apple/xcode/mokoMvvmFlowSwiftUI/ViewModelState.swift
@@ -83,7 +83,16 @@ public extension ObservableObject where Self: ViewModel {
     func state<T>(_ flowKey: KeyPath<Self, CStateFlow<NSArray>>) -> Array<T> {
         return state(
             flowKey,
-            equals: { $0 === $1 },
+            equals: { oldValue, newValue in
+                if let oldValue = oldValue {
+                    guard let newValue = newValue as? Array<T> else {
+                        return false
+                    }
+                    return oldValue.isEqual(to: newValue)
+                } else {
+                    return newValue == nil
+                }
+            },
             mapper: { $0 as! Array<T> }
         )
     }
diff --git a/mvvm-flow/apple/xcode/mokoMvvmFlowSwiftUI/ViewModelStateNullable.swift b/mvvm-flow/apple/xcode/mokoMvvmFlowSwiftUI/ViewModelStateNullable.swift
diff --git a/mvvm-livedata-compose/build.gradle.kts b/mvvm-livedata-compose/build.gradle.kts
diff --git a/mvvm-livedata-material/src/main/kotlin/dev/icerock/moko/mvvm/livedata/material/TextInputLayoutBindings.kt b/mvvm-livedata-material/src/main/kotlin/dev/icerock/moko/mvvm/livedata/material/TextInputLayoutBindings.kt
diff --git a/sample/android-app/src/main/AndroidManifest.xml b/sample/android-app/src/main/AndroidManifest.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`	`import com.android.build.gradle.BaseExtension`
`6`	`6`
`7`	`7`	`configure<BaseExtension> {`
`8`		`- compileSdkVersion(30)`
	`8`	`+ compileSdkVersion(33)`
`9`	`9`
`10`	`10`	`defaultConfig {`
`11`		`- minSdkVersion(16)`
`12`		`- targetSdkVersion(30)`
	`11`	`+ minSdk = 16`
	`12`	`+ targetSdk = 33`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ dependencies {`
`13`	`13`
`14`	`14`	`commonMainApi(libs.coroutines)`
`15`	`15`
`16`		`- androidMainApi(libs.appCompat)`
	`16`	`+ androidMainApi(libs.lifecycleKtx)`
`17`	`17`	`androidMainApi(libs.androidViewModel)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import kotlinx.coroutines.CoroutineScope`
`8`	`8`
`9`	`9`	`@Suppress("EmptyDefaultConstructor")`
`10`	`10`	`expect open class ViewModel() {`
`11`		`- protected val viewModelScope: CoroutineScope`
	`11`	`+ val viewModelScope: CoroutineScope`
`12`	`12`
`13`	`13`	`open fun onCleared()`
`14`	`14`	`}`