Merge pull request #310 from icerockdev/#309-apple-silicon

#309 apple silicon

README.md

@@ -1,5 +1,5 @@
 ![moko-widgets](https://user-images.githubusercontent.com/5010169/70204294-93a45900-1752-11ea-9bb6-820d514ceef9.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/moko-widgets) ](https://repo1.maven.org/maven2/dev/icerock/moko/moko-widgets) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=widgets)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/widgets) ](https://repo1.maven.org/maven2/dev/icerock/moko/widgets/) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=widgets)
 
 # Mobile Kotlin widgets
 This is a Kotlin MultiPlatform library that provides declarative UI and application screens management

build.gradle.kts

@@ -4,21 +4,20 @@
 
 buildscript {
     repositories {
+        gradlePluginPortal()
         mavenCentral()
         google()
-        gradlePluginPortal()
         jcenter()
     }
     dependencies {
-        classpath("dev.icerock.moko:resources-generator:0.16.2")
+        classpath("dev.icerock.moko:resources-generator:0.21.2")
         classpath("dev.icerock.moko.widgets:gradle-plugin")
 
         classpath(":widgets-build-logic")
     }
 }
 
 allprojects {
-
     plugins.withId("org.gradle.maven-publish") {
         group = "dev.icerock.moko"
         version = libs.versions.mokoWidgetsVersion.get()

gradle.properties

@@ -3,13 +3,11 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
-
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.enableCInteropCommonization=true
 
 android.useAndroidX=true
 
 mobile.multiplatform.useIosShortcut=false
 mobile.multiplatform.iosTargetWarning=false
-mobile.multiplatform.podsProject=sample/ios-app/Pods/Pods.xcodeproj
+mobile.multiplatform.podsProject=sample/ios-app/Pods/Pods.xcodeproj

gradle/libs.versions.toml

@@ -1,28 +1,30 @@
 [versions]
-kotlinVersion = "1.5.20"
-mokoWidgetsVersion = "0.1.0"
-mokoResourcesVersion = "0.16.2"
-appCompatVersion = "1.3.1"
-fragmentVersion = "1.3.6"
+kotlinVersion = "1.8.10"
+
+mokoWidgetsVersion = "0.2.0"
+mokoResourcesVersion = "0.21.2"
+mokoMvvmVersion = "0.16.0"
+mokoFieldsVersion = "0.12.0"
+mokoUnitsVersion = "0.8.0"
+mokoMediaVersion = "0.11.0"
+mokoPermissionsVersion = "0.16.0"
+mokoGraphicsVersion = "0.9.0"
+mokoParcelizeVersion = "0.8.0"
+
+appCompatVersion = "1.6.1"
+fragmentVersion = "1.5.6"
 swipeRefreshLayoutVersion = "1.1.0"
-materialVersion = "1.4.0"
-constraintLayoutVersion = "2.0.4"
-lifecycleVersion = "2.3.1"
-recyclerViewVersion = "1.2.1"
+materialVersion = "1.8.0"
+constraintLayoutVersion = "2.1.4"
+lifecycleVersion = "2.6.1"
+recyclerViewVersion = "1.3.0"
 inputMaskVersion = "6.0.0"
-glideVersion = "4.12.0"
+glideVersion = "4.14.2"
 roundedImageViewVersion = "2.3.0"
-playServiceAuthVersion = "19.2.0"
-playServiceAuthSmsVersion = "17.5.1"
-coroutinesVersion = "1.5.1-native-mt"
-mokoMvvmVersion = "0.11.0"
-mokoFieldsVersion = "0.8.0"
-mokoUnitsVersion = "0.6.2"
-mokoMediaVersion = "0.9.0"
-mokoPermissionsVersion = "0.10.1"
-mokoGraphicsVersion = "0.8.0"
-mokoParcelizeVersion = "0.7.1"
-klockVersion = "2.3.1"
+playServiceAuthVersion = "20.5.0"
+playServiceAuthSmsVersion = "18.0.1"
+coroutinesVersion = "1.6.4"
+klockVersion = "3.4.0"
 autoServiceVersion = "1.0-rc6"
 
 [libraries]
@@ -38,17 +40,19 @@ glide = { module = "com.github.bumptech.glide:glide", version.ref = "glideVersio
 roundedImageView = { module = "com.makeramen:roundedimageview", version.ref = "roundedImageViewVersion" }
 playServiceAuth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServiceAuthVersion" }
 playServiceAuthSms = { module = "com.google.android.gms:play-services-auth-api-phone", version.ref = "playServiceAuthSmsVersion" }
+
 mokoResources = { module = "dev.icerock.moko:resources", version.ref = "mokoResourcesVersion" }
 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" }
-mokoFields = { module = "dev.icerock.moko:fields", version.ref = "mokoFieldsVersion" }
+mokoFields = { module = "dev.icerock.moko:fields-livedata", version.ref = "mokoFieldsVersion" }
 mokoUnits = { module = "dev.icerock.moko:units", version.ref = "mokoUnitsVersion" }
 mokoMedia = { module = "dev.icerock.moko:media", version.ref = "mokoMediaVersion" }
 mokoPermissions = { module = "dev.icerock.moko:permissions", version.ref = "mokoPermissionsVersion" }
 mokoGraphics = { module = "dev.icerock.moko:graphics", version.ref = "mokoGraphicsVersion" }
 mokoParcelize = { module = "dev.icerock.moko:parcelize", version.ref = "mokoParcelizeVersion" }
+
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
 klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klockVersion" }
 autoService = { module = "com.google.auto.service:auto-service", version.ref = "autoServiceVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugin/gradle-plugin/src/main/kotlin/dev/icerock/moko/widgets/WidgetsGeneratorGradlePlugin.kt

@@ -4,23 +4,53 @@
 
 package dev.icerock.moko.widgets
 
+import dev.icerock.moko.widgets.gradle_plugin.BuildConfig
 import org.gradle.api.Project
+import org.gradle.api.internal.provider.DefaultProvider
+import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
+import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
+import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 import java.io.File
 
-open class WidgetsGeneratorGradlePlugin : org.gradle.api.Plugin<Project> {
-    override fun apply(project: Project) {
-        project.plugins.withType<KotlinMultiplatformPluginWrapper> {
-            project.configure<KotlinMultiplatformExtension> {
-                val path = getGenerationDir(project).path
+open class WidgetsGeneratorGradlePlugin : KotlinCompilerPluginSupportPlugin {
+    override fun apply(target: Project) {
+        target.plugins.withType<KotlinMultiplatformPluginWrapper> {
+            target.configure<KotlinMultiplatformExtension> {
+                val path = getGenerationDir(target).path
                 sourceSets.getByName(KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME).kotlin.srcDir(path)
             }
         }
     }
+
+    override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider<List<SubpluginOption>> {
+        return DefaultProvider {
+            listOf(
+                SubpluginOption(
+                    key = "generationDir",
+                    value = getGenerationDir(kotlinCompilation.target.project).path
+                )
+            )
+        }
+    }
+
+    override fun getCompilerPluginId(): String = "widgets-generator"
+
+    override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact(
+        groupId = "dev.icerock.moko.widgets",
+        artifactId = "kotlin-plugin",
+        version = BuildConfig.compilerPluginVersion
+    )
+
+    override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean {
+        return true
+    }
 }
 
 fun getGenerationDir(project: Project): File {