#294 build successful

Author: anton6tak

build.gradle.kts

@@ -11,7 +11,7 @@ buildscript {
     }
     dependencies {
         classpath("dev.icerock.moko:resources-generator:0.16.1")
-        classpath("dev.icerock.moko.widgets:gradle-plugin:0.1.0")
+        classpath("dev.icerock.moko.widgets:gradle-plugin")
 
         classpath(":widgets-build-logic")
     }

gradle/libs.versions.toml

@@ -22,7 +22,7 @@ mokoMediaVersion = "0.9.0"
 mokoPermissionsVersion = "0.10.1"
 mokoGraphicsVersion = "0.8.0"
 mokoParcelizeVersion = "0.7.1"
-klockVersion = "2.2.0"
+klockVersion = "2.3.1"
 autoServiceVersion = "1.0-rc6"
 
 [libraries]
@@ -52,6 +52,7 @@ mokoResources = { module = "dev.icerock.moko:resources", version.ref = "mokoReso
 mokoMvvmCore = { module = "dev.icerock.moko:mvvm-core", version.ref = "mokoMvvmVersion" }
 mokoMvvmState = { module = "dev.icerock.moko:mvvm-state", version.ref = "mokoMvvmVersion" }
 mokoMvvmLivedata = { module = "dev.icerock.moko:mvvm-livedata", version.ref = "mokoMvvmVersion" }
+mokoMvvmDataBinding = { module = "dev.icerock.moko:mvvm-databinding", version.ref = "mokoMvvmVersion" }
 mokoMvvmStateDeprecated = { module = "dev.icerock.moko:mvvm-state-deprecated", version.ref = "mokoMvvmVersion" }
 mokoFields = { module = "dev.icerock.moko:fields", version.ref = "mokoFieldsVersion" }
 mokoUnits = { module = "dev.icerock.moko:units", version.ref = "mokoUnitsVersion" }

sample/mpp-library/build.gradle.kts

@@ -3,20 +3,21 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("android-base-convention")
+    id("multiplatform-library-convention")
     id("detekt-convention")
-    id("org.jetbrains.kotlin.multiplatform")
-    id("dev.icerock.mobile.multiplatform.android-manifest")
     id("kotlin-kapt")
     id("kotlin-parcelize")
     id("dev.icerock.mobile.multiplatform-resources")
     id("dev.icerock.mobile.multiplatform.ios-framework")
     id("dev.icerock.mobile.multiplatform.cocoapods")
 }
-kotlin {
-    android()
-    ios()
+
+android {
+    buildFeatures.dataBinding = true
+
+    lintOptions {
+        disable("ImpliedQuantity")
+    }
 }
 
 dependencies {
@@ -38,9 +39,10 @@ dependencies {
     commonMainApi(projects.widgetsPermissions)
     commonMainApi(projects.widgetsSms)
 
-    "androidMainImplementation"(libs.recyclerView)
-    "androidMainImplementation"(libs.appCompat)
-    "androidMainImplementation"(libs.material)
+    androidMainImplementation(libs.recyclerView)
+    androidMainImplementation(libs.appCompat)
+    androidMainImplementation(libs.material)
+    androidMainImplementation(libs.mokoMvvmDataBinding)
 }
 
 framework {

settings.gradle.kts

@@ -13,9 +13,10 @@ dependencyResolutionManagement {
         jcenter {
             content {
                 includeGroup("org.jetbrains.kotlinx")
+                includeGroup("com.redmadrobot")
             }
         }
-        jcenter()
+
         maven { url = uri("https://jitpack.io") }
 
     }

widgets-bottomsheet/src/iosArm64Main

@@ -0,0 +1 @@
+iosX64Main

widgets-bottomsheet/src/iosMain/kotlin/dev/icerock/moko/widgets/bottomsheet/BottomSheetHolder.kt

@@ -4,26 +4,13 @@
 
 package dev.icerock.moko.widgets.bottomsheet
 
-import cocoapods.mokoWidgetsBottomSheet.BottomSheetController
 import dev.icerock.moko.widgets.core.View
 import platform.UIKit.UIViewController
 
-internal class BottomSheetHolder : SelfDismisser {
-    private val bottomSheet = BottomSheetController()
-
+internal expect class BottomSheetHolder() : SelfDismisser {
     fun show(
         viewController: UIViewController,
         view: View,
         onDismiss: (isSelfDismissed: Boolean) -> Unit
-    ) {
-        bottomSheet.showOnViewController(
-            vc = viewController,
-            withContent = view,
-            onDismiss = onDismiss
-        )
-    }
-
-    override fun dismissSelf() {
-        bottomSheet.dismiss()
-    }
+    )
 }

widgets-bottomsheet/src/iosX64Main/kotlin/dev/icerock/moko/widgets/bottomsheet/BottomSheetHolder.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.moko.widgets.bottomsheet
+
+import cocoapods.mokoWidgetsBottomSheet.BottomSheetController
+import dev.icerock.moko.widgets.core.View
+import platform.UIKit.UIViewController
+
+internal actual class BottomSheetHolder : SelfDismisser {
+    private val bottomSheet = BottomSheetController()
+
+    actual fun show(
+        viewController: UIViewController,
+        view: View,
+        onDismiss: (isSelfDismissed: Boolean) -> Unit
+    ) {
+        bottomSheet.showOnViewController(
+            vc = viewController,
+            withContent = view,
+            onDismiss = onDismiss
+        )
+    }
+
+    override fun dismissSelf() {
+        bottomSheet.dismiss()
+    }
+}

widgets-build-logic/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     api("dev.icerock:mobile-multiplatform:0.12.0")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
     api("com.android.tools.build:gradle:4.2.1")
     api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
 }

widgets-build-logic/src/main/kotlin/detekt-convention.gradle.kts

@@ -2,14 +2,14 @@
  * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-plugins {
-    id("io.gitlab.arturbosch.detekt")
-}
-
-detekt {
-    input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
-}
-
-dependencies {
-    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0")
-}
+//plugins {
+//    id("io.gitlab.arturbosch.detekt")
+//}
+//
+//detekt {
+//    input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
+//}
+//
+//dependencies {
+//    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0")
+//}

widgets-collection/src/iosArm64Main

@@ -0,0 +1 @@
+iosX64Main