#309 fix build task

Alex009 · Alex009 · commit d88a73ca6493 · 2023-04-18T11:59:27.000+06:00
diff --git a/sample/android-app/build.gradle.kts b/sample/android-app/build.gradle.kts
@@ -5,17 +5,16 @@
 plugins {
     id("android-app-convention")
     id("detekt-convention")
-    id("kotlin-kapt")
 }
 
 android {
-    buildFeatures.dataBinding = true
-
     defaultConfig {
         applicationId = "dev.icerock.moko.samples.widgets"
 
         versionCode = 1
         versionName = "0.1.0"
+
+        multiDexEnabled = true
     }
     
     compileOptions {
diff --git a/sample/android-app/src/main/AndroidManifest.xml b/sample/android-app/src/main/AndroidManifest.xml
@@ -3,16 +3,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.icerockdev">
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".MainApplication"
         android:label="moko-widgets test app"
+        android:icon="@drawable/logo"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -4,8 +4,6 @@
 
 plugins {
     id("multiplatform-library-convention")
-    id("detekt-convention")
-    id("kotlin-kapt")
     id("kotlin-parcelize")
     id("dev.icerock.mobile.multiplatform-resources")
     id("dev.icerock.mobile.multiplatform.ios-framework")
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/CryptoProfileSample.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/CryptoProfileSample.kt
@@ -4,9 +4,9 @@
 
 package com.icerockdev.library.sample
 
-import dev.icerock.moko.fields.FormField
-import dev.icerock.moko.fields.liveBlock
-import dev.icerock.moko.fields.validate
+import dev.icerock.moko.fields.core.validate
+import dev.icerock.moko.fields.livedata.FormField
+import dev.icerock.moko.fields.livedata.liveBlock
 import dev.icerock.moko.mvvm.livedata.mergeWith
 import dev.icerock.moko.mvvm.viewmodel.ViewModel
 import dev.icerock.moko.resources.desc.StringDesc
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/McommerceProfileSample.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/McommerceProfileSample.kt
@@ -4,9 +4,9 @@
 
 package com.icerockdev.library.sample
 
-import dev.icerock.moko.fields.FormField
-import dev.icerock.moko.fields.liveBlock
-import dev.icerock.moko.fields.validate
+import dev.icerock.moko.fields.core.validate
+import dev.icerock.moko.fields.livedata.FormField
+import dev.icerock.moko.fields.livedata.liveBlock
 import dev.icerock.moko.mvvm.viewmodel.ViewModel
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.resources.desc.desc
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/SocialProfileSample.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/SocialProfileSample.kt
@@ -4,9 +4,9 @@
 
 package com.icerockdev.library.sample
 
-import dev.icerock.moko.fields.FormField
-import dev.icerock.moko.fields.liveBlock
-import dev.icerock.moko.fields.validate
+import dev.icerock.moko.fields.core.validate
+import dev.icerock.moko.fields.livedata.FormField
+import dev.icerock.moko.fields.livedata.liveBlock
 import dev.icerock.moko.mvvm.livedata.LiveData
 import dev.icerock.moko.mvvm.livedata.MutableLiveData
 import dev.icerock.moko.mvvm.livedata.map
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/LoginScreen.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/universal/LoginScreen.kt
@@ -4,8 +4,8 @@
 
 package com.icerockdev.library.universal
 
-import dev.icerock.moko.fields.FormField
-import dev.icerock.moko.fields.liveBlock
+import dev.icerock.moko.fields.livedata.FormField
+import dev.icerock.moko.fields.livedata.liveBlock
 import dev.icerock.moko.mvvm.dispatcher.EventsDispatcher
 import dev.icerock.moko.mvvm.dispatcher.EventsDispatcherOwner
 import dev.icerock.moko.mvvm.viewmodel.ViewModel
diff --git a/sample/mpp-library/src/commonMain/kotlin/dev/icerock/moko/widgets/sample/InputWidgetGalleryScreen.kt b/sample/mpp-library/src/commonMain/kotlin/dev/icerock/moko/widgets/sample/InputWidgetGalleryScreen.kt
@@ -4,8 +4,8 @@
 
 package dev.icerock.moko.widgets.sample
 
-import dev.icerock.moko.fields.FormField
-import dev.icerock.moko.fields.liveBlock
+import dev.icerock.moko.fields.livedata.FormField
+import dev.icerock.moko.fields.livedata.liveBlock
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.resources.desc.desc
 import dev.icerock.moko.widgets.core.widget.InputWidget
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemSingleChoiceViewFactory.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemSingleChoiceViewFactory.kt
@@ -36,7 +36,7 @@ import dev.icerock.moko.widgets.core.utils.androidId
 import dev.icerock.moko.widgets.core.utils.bind
 import dev.icerock.moko.widgets.core.utils.dp
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "UnusedPrivateMember")
 actual class SystemSingleChoiceViewFactory actual constructor(
     private val textStyle: TextStyle<Color>?,
     private val labelTextStyle: TextStyle<Color>?,
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/screen/FragmentNavigation.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/screen/FragmentNavigation.kt
@@ -22,6 +22,7 @@ internal class FragmentNavigation(
         val fm = fragment.childFragmentManager
 
         val backStackCount = fm.backStackEntryCount
+        @Suppress("UnusedPrivateMember")
         for (i in 0 until backStackCount) {
             fm.popBackStack()
         }
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/screen/navigation/BottomNavigationScreen.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/screen/navigation/BottomNavigationScreen.kt
@@ -242,11 +242,9 @@ actual abstract class BottomNavigationScreen actual constructor(
     private fun updateTitleMode() {
         bottomNavigationView?.also { navView ->
             if (isTitleVisible) {
-                navView.labelVisibilityMode =
-                    LabelVisibilityMode.LABEL_VISIBILITY_LABELED
+                navView.labelVisibilityMode = BottomNavigationView.LABEL_VISIBILITY_LABELED
             } else {
-                navView.labelVisibilityMode =
-                    LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED
+                navView.labelVisibilityMode = BottomNavigationView.LABEL_VISIBILITY_UNLABELED
             }
         }
     }
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/screen/navigation/NavigationScreen.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/screen/navigation/NavigationScreen.kt
@@ -296,6 +296,7 @@ actual abstract class NavigationScreen<S> actual constructor(
             return object : Route<Unit> {
                 override fun route(arg: Unit) {
                     val fragmentManager = navigationScreen!!.getChildFragmentManager()
+                    @Suppress("UnusedPrivateMember")
                     for (i in 0 until fragmentManager.backStackEntryCount) {
                         fragmentManager.popBackStack()
                     }
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/style/ext/TextAlignmentExt.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/style/ext/TextAlignmentExt.kt
@@ -35,6 +35,7 @@ fun getGravityForTextAlignment(
     } else if (textVerticalAlignment != null) {
         textVerticalAlignment.getGravity()
     } else {
+        @Suppress("UseRequire")
         throw IllegalArgumentException("At least one argument must be nonnull.")
     }
 }
diff --git a/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/utils/IdExt.kt b/widgets/src/androidMain/kotlin/dev/icerock/moko/widgets/core/utils/IdExt.kt
@@ -30,6 +30,7 @@ val <T : Widget<out WidgetSize>> Theme.Id<T>.androidId: Int
         val fullId = 0x7f081000 + id
 
         if (BuildConfig.DEBUG) {
+            @Suppress("ImplicitDefaultLocale")
             println(String.format("id %s transformed to 0x%X", idString, fullId))
         }
 
@@ -40,6 +41,7 @@ val <T : Widget<out WidgetSize>> Theme.Id<T>.androidId: Int
                 .first()
                 .javaClass.name
 
+            @Suppress("ImplicitDefaultLocale")
             val msg = String.format(
                 "id 0x%X already used by %s, it conflict with %s",
                 fullId,
diff --git a/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/screen/navigation/NavigationScreen.kt b/widgets/src/commonMain/kotlin/dev/icerock/moko/widgets/core/screen/navigation/NavigationScreen.kt
@@ -16,6 +16,7 @@ import dev.icerock.moko.widgets.core.style.background.Background
 import dev.icerock.moko.widgets.core.style.background.Fill
 import dev.icerock.moko.widgets.core.style.view.TextStyle
 
+@Suppress("UnnecessaryAbstractClass")
 expect abstract class NavigationScreen<S>(
     initialScreen: TypedScreenDesc<Args.Empty, S>,
     router: Router
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemInputViewFactory.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemInputViewFactory.kt
@@ -35,7 +35,7 @@ import platform.UIKit.UITextField
 import platform.UIKit.clipsToBounds
 import platform.UIKit.translatesAutoresizingMaskIntoConstraints
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "UnusedPrivateMember")
 actual open class SystemInputViewFactory actual constructor(
     private val background: Background<Fill.Solid>?,
     override val margins: MarginValues?,
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemListViewFactory.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemListViewFactory.kt
@@ -38,6 +38,7 @@ import platform.UIKit.UITableViewStyle
 import platform.UIKit.layoutMargins
 import platform.UIKit.translatesAutoresizingMaskIntoConstraints
 
+@Suppress("UnusedPrivateMember")
 actual class SystemListViewFactory actual constructor(
     private val background: Background<Fill.Solid>?,
     private val dividerEnabled: Boolean?,
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemSingleChoiceViewFactory.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/factory/SystemSingleChoiceViewFactory.kt
@@ -17,7 +17,7 @@ import dev.icerock.moko.widgets.core.style.view.WidgetSize
 import dev.icerock.moko.widgets.core.widget.SingleChoiceWidget
 import platform.UIKit.UIView
 
-@Suppress("LongParameterList")
+@Suppress("LongParameterList", "UnusedPrivateMember")
 actual class SystemSingleChoiceViewFactory actual constructor(
     private val textStyle: TextStyle<Color>?,
     private val labelTextStyle: TextStyle<Color>?,
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/UIControlExt.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/UIControlExt.kt
@@ -70,6 +70,7 @@ class LambdaTarget(val lambda: () -> Unit) : NSObject() {
     }
 
     @ObjCAction
+    @Suppress("UnusedPrivateMember")
     fun displayLink(link: CADisplayLink) {
         lambda()
     }
diff --git a/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/setAssociatedObject.kt b/widgets/src/iosMain/kotlin/dev/icerock/moko/widgets/core/utils/setAssociatedObject.kt
@@ -4,12 +4,12 @@
 
 package dev.icerock.moko.widgets.core.utils
 
-fun setAssociatedObject(`object`: Any?, value: Any?) {
-    dev.icerock.moko.widgets.objc.setAssociatedObject(`object`, value)
+fun setAssociatedObject(obj: Any?, value: Any?) {
+    dev.icerock.moko.widgets.objc.setAssociatedObject(obj, value)
 }
 
-fun getAssociatedObject(`object`: Any?): Any? {
-    return dev.icerock.moko.widgets.objc.getAssociatedObject(`object`)
+fun getAssociatedObject(obj: Any?): Any? {
+    return dev.icerock.moko.widgets.objc.getAssociatedObject(obj)
 }
 
 fun cgColors(uiColors: List<*>?): List<*>? {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ internal class FragmentNavigation(`
`22`	`22`	`val fm = fragment.childFragmentManager`
`23`	`23`
`24`	`24`	`val backStackCount = fm.backStackEntryCount`
	`25`	`+ @Suppress("UnusedPrivateMember")`
`25`	`26`	`for (i in 0 until backStackCount) {`
`26`	`27`	`fm.popBackStack()`
`27`	`28`	`}`