#294 added embed-configuration-gradle-plugin and fixes

anton6tak · anton6tak · commit 8f52123b9df4 · 2021-07-22T14:52:44.000+07:00
diff --git a/gradle.properties b/gradle.properties
@@ -4,11 +4,11 @@ org.gradle.parallel=true
 
 kotlin.code.style=official
 
-android.useAndroidX=true
+kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.mpp.enableCompatibilityMetadataVariant=true
 
-# Workaround for Bintray treating .sha512 files as artifacts
-# https://github.com/gradle/gradle/issues/11412
-systemProp.org.gradle.internal.publish.checksums.insecure=true
+android.useAndroidX=true
 
 mobile.multiplatform.useIosShortcut=false
 mobile.multiplatform.iosTargetWarning=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ mokoFieldsVersion = "0.8.0"
 mokoUnitsVersion = "0.6.0"
 mokoMediaVersion = "0.9.0"
 mokoPermissionsVersion = "0.10.1"
-mokoGraphicsVersion = "0.7.0"
+mokoGraphicsVersion = "0.8.0"
 mokoParcelizeVersion = "0.7.1"
 klockVersion = "2.2.0"
 autoServiceVersion = "1.0-rc6"
diff --git a/plugin/kotlin-native-plugin/build.gradle.kts b/plugin/kotlin-native-plugin/build.gradle.kts
@@ -6,30 +6,18 @@ plugins {
     id("org.jetbrains.kotlin.jvm")
     id("org.gradle.maven-publish")
     id("kotlin-kapt")
-}
-
-val embedImplementationConfig = "embedImplementation"
-configurations {
-    val embedImplementation = create(embedImplementationConfig)
-    implementation.get().extendsFrom(embedImplementation)
+    id("embed-configuration-convention")
 }
 
 dependencies {
-    embedImplementationConfig(project(":kotlin-common-plugin"))
+    "embedImplementation"(projects.kotlinCommonPlugin)
 
     compileOnly("org.jetbrains.kotlin:kotlin-compiler")
 
     compileOnly(libs.autoService)
     kapt(libs.autoService)
 }
 
-tasks.jar {
-    from({
-        val embedConfiguration = configurations.getByName(embedImplementationConfig)
-        embedConfiguration.map { if(it.isDirectory) it else zipTree(it) }
-    })
-}
-
 publishing {
     publications {
         register("pluginMaven", MavenPublication::class) {
diff --git a/plugin/kotlin-plugin/build.gradle.kts b/plugin/kotlin-plugin/build.gradle.kts
@@ -6,30 +6,18 @@ plugins {
     id("org.jetbrains.kotlin.jvm")
     id("org.gradle.maven-publish")
     id("kotlin-kapt")
-}
-
-val embedImplementationConfig = "embedImplementation"
-configurations {
-    val embedImplementation = create(embedImplementationConfig)
-    implementation.get().extendsFrom(embedImplementation)
+    id("embed-configuration-convention")
 }
 
 dependencies {
-    embedImplementationConfig(projects.kotlinCommonPlugin)
+    "embedImplementation"(projects.kotlinCommonPlugin)
 
     compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable")
 
     compileOnly(libs.autoService)
     kapt(libs.autoService)
 }
 
-tasks.jar {
-    from({
-        val embedConfiguration = configurations.getByName(embedImplementationConfig)
-        embedConfiguration.map { if(it.isDirectory) it else zipTree(it) }
-    })
-}
-
 publishing {
     publications {
         register("pluginMaven", MavenPublication::class) {
diff --git a/plugin/settings.gradle.kts b/plugin/settings.gradle.kts
@@ -1,7 +1,7 @@
 /*
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
-
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
 pluginManagement {
diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts
@@ -22,18 +22,21 @@ kotlin {
 dependencies {
     commonMainImplementation(libs.coroutines)
 
-    commonMainImplementation(libs.mokoResources)
-    commonMainImplementation(libs.mokoMvvmCore)
-    commonMainImplementation(libs.mokoUnits)
-    commonMainImplementation(libs.mokoGraphics)
-    commonMainImplementation(libs.mokoWidgets)
-    commonMainImplementation(libs.mokoWidgetsBottomSheet)
-    commonMainImplementation(libs.mokoWidgetsCollection)
-    commonMainImplementation(libs.mokoWidgetsDateTimePicker)
-    commonMainImplementation(libs.mokoWidgetsImageNetwork)
-    commonMainImplementation(libs.mokoWidgetsMedia)
-    commonMainImplementation(libs.mokoWidgetsPermissions)
-    commonMainImplementation(libs.mokoWidgetsSms)
+    commonMainApi(libs.mokoMedia)
+    commonMainApi(libs.mokoPermissions)
+    commonMainApi(libs.mokoResources)
+    commonMainApi(libs.mokoMvvmCore)
+    commonMainApi(libs.mokoUnits)
+    commonMainApi(libs.mokoGraphics)
+    
+    commonMainApi(projects.widgets)
+    commonMainApi(projects.widgetsBottomsheet)
+    commonMainApi(projects.widgetsCollection)
+    commonMainApi(projects.widgetsDatetimePicker)
+    commonMainApi(projects.widgetsImageNetwork)
+    commonMainApi(projects.widgetsMedia)
+    commonMainApi(projects.widgetsPermissions)
+    commonMainApi(projects.widgetsSms)
 
     "androidMainImplementation"(libs.recyclerView)
     "androidMainImplementation"(libs.appCompat)
diff --git a/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/StateSample.kt b/sample/mpp-library/src/commonMain/kotlin/com/icerockdev/library/sample/StateSample.kt
@@ -4,7 +4,7 @@
 
 package com.icerockdev.library.sample
 
-import dev.icerock.moko.mvvm.State
+import dev.icerock.moko.mvvm.ResourceState
 import dev.icerock.moko.mvvm.livedata.LiveData
 import dev.icerock.moko.mvvm.livedata.MutableLiveData
 import dev.icerock.moko.mvvm.livedata.map
@@ -100,24 +100,24 @@ open class StateScreen(
 }
 
 interface StateViewModelContract {
-    val state: LiveData<State<String, String>>
+    val state: LiveData<ResourceState<String, String>>
 
     fun onChangeStatePressed()
 }
 
 class StateViewModel : ViewModel(), StateViewModelContract {
-    private val _state: MutableLiveData<State<String, String>> =
-        MutableLiveData(initialValue = State.Empty())
-    override val state: LiveData<State<String, String>> = _state
+    private val _state: MutableLiveData<ResourceState<String, String>> =
+        MutableLiveData(initialValue = ResourceState.Empty())
+    override val state: LiveData<ResourceState<String, String>> = _state
 
     override fun onChangeStatePressed() {
         when (state.value) {
-            is State.Empty -> _state.value = State.Loading()
-            is State.Loading -> {
-                _state.value = State.Data(data = "hello!")
+            is ResourceState.Empty -> _state.value = ResourceState.Loading()
+            is ResourceState.Loading -> {
+                _state.value = ResourceState.Success(data = "hello!")
             }
-            is State.Data -> _state.value = State.Error(error = "this is error")
-            is State.Error -> _state.value = State.Empty()
+            is ResourceState.Success -> _state.value = ResourceState.Failed(error = "this is error")
+            is ResourceState.Failed -> _state.value = ResourceState.Empty()
         }
     }
 }
diff --git a/widgets-build-logic/src/main/kotlin/embed-configuration-convention.gradle.kts b/widgets-build-logic/src/main/kotlin/embed-configuration-convention.gradle.kts
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("org.jetbrains.kotlin.jvm")
+}
+
+val embedImplementationConfig = "embedImplementation"
+
+configurations {
+    val embedImplementation = create(embedImplementationConfig)
+    implementation.get().extendsFrom(embedImplementation)
+}
+
+tasks.jar {
+    from({
+        val embedConfiguration = configurations.getByName(embedImplementationConfig)
+        embedConfiguration.map { file ->
+            if (file.isDirectory) file else zipTree(file).matching {
+                exclude("META-INF/versions/**")
+            }
+        }
+    })
+}
diff --git a/widgets-media/src/iosMain/kotlin/dev/icerock/moko/widgets/media/MediaControllerExt.kt b/widgets-media/src/iosMain/kotlin/dev/icerock/moko/widgets/media/MediaControllerExt.kt
@@ -7,10 +7,10 @@ package dev.icerock.moko.widgets.media
 import dev.icerock.moko.media.picker.MediaPickerController
 import dev.icerock.moko.permissions.PermissionsController
 import dev.icerock.moko.widgets.core.screen.Screen
-import dev.icerock.moko.media.picker.ios.MediaPickerControllerProtocol
+import dev.icerock.moko.media.picker.ios.MediaPickerController as IosMediaPickerController
 
 actual fun Screen<*>.createMediaPickerController(permissionsController: PermissionsController): MediaPickerController {
-    return MediaPickerControllerProtocol(
+    return IosMediaPickerController(
         permissionsController = permissionsController,
         getViewController = { this.viewController }
     )
diff --git a/widgets-permissions/src/iosMain/kotlin/dev/icerock/moko/widgets/permissions/PermissionsControllerExt.kt b/widgets-permissions/src/iosMain/kotlin/dev/icerock/moko/widgets/permissions/PermissionsControllerExt.kt
@@ -6,10 +6,10 @@ package dev.icerock.moko.widgets.permissions
 
 import dev.icerock.moko.permissions.PermissionsController
 import dev.icerock.moko.widgets.core.screen.Screen
-import dev.icerock.moko.permissions.ios
+import dev.icerock.moko.permissions.ios.PermissionsController as IosPermissionsController
 
-actual fun Screen<*>.createPermissionsController(): PermissionsControllerProtocol {
-    return PermissionsController()
+actual fun Screen<*>.createPermissionsController(): PermissionsController {
+    return IosPermissionsController()
 }
 
 actual fun PermissionsController.bind(screen: Screen<*>) {
diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts
@@ -33,12 +33,14 @@ dependencies {
 }
 
 kotlin {
-    targets.filterIsInstance<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>()
-        .forEach { target ->
-            target.compilations.getByName("main") {
-                val objcAddtition by cinterops.creating {
+    targets
+        .matching { it is org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget }
+        .configureEach {
+            this as org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+
+            compilations.getByName("main") {
+                val pluralizedString by cinterops.creating {
                     defFile(project.file("src/iosMain/def/objcAddtition.def"))
-                    packageName("dev.icerock.moko.widgets.core.objc")
                 }
             }
         }
diff --git a/widgets/src/iosMain/def/objcAddtition.def b/widgets/src/iosMain/def/objcAddtition.def
@@ -1,4 +1,5 @@
 language = Objective-C
+package = dev.icerock.moko.widgets.objc
 ---
 #import <objc/runtime.h>
 #import <UIKit/UIColor.h>
