Merge pull request #56 from nrobi144/feature/add-iossimulatorarm64

Add iosSimulatorArm64, macosArm64, watchosSimulatorArm64, and tvosSim…

Author: Alex009

README.md

@@ -8,14 +8,14 @@ This is a Gradle plugin for simple setup of Kotlin Multiplatform mobile Gradle m
 `buildSrc/build.gradle.kts`
 ```kotlin
 repositories {
-    mavenCentral()
     google()
+    gradlePluginPortal()
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.12.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
-    implementation("com.android.tools.build:gradle:4.2.1")
+    implementation("dev.icerock:mobile-multiplatform:0.13.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+    implementation("com.android.tools.build:gradle:7.0.4")
 }
 ```
 
@@ -40,9 +40,10 @@ into `gradle.properties` line:
 mobile.multiplatform.useIosShortcut=false
 ```
 
-To disable warning about used ios targets add into `gradle.properties` line:
+Also by default `iosSimulatorArm64` target will be created (with connection to `iosMain` and
+ `iosTest` if was used ios shortcut. To disable it add into `gradle.properties` line:
 ```
-mobile.multiplatform.iosTargetWarning=false
+mobile.multiplatform.withoutIosSimulatorArm64=false
 ```
 
 ### Setup AndroidManifest.xml in androidMain sourceSet

gradle.properties

@@ -3,7 +3,3 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
-
-# Workaround for Bintray treating .sha512 files as artifacts
-# https://github.com/gradle/gradle/issues/11412
-systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-kotlinVersion = "1.5.21"
-androidGradlePluginVerison = "4.2.1"
+kotlinVersion = "1.6.10"
+androidGradlePluginVerison = "7.0.4"
 publishPluginVersion = "0.15.0"
-mobileMultiplatformGradlePluginVersion = "0.12.0"
+mobileMultiplatformGradlePluginVersion = "0.13.0"
 
 [libraries]
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePluginVerison" }

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.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/MultiPlatformLibrary.kt

@@ -13,13 +13,17 @@ data class MultiPlatformLibrary(
     val iosX64: String? = null,
     val iosArm32: String? = null,
     val iosArm64: String? = null,
+    val iosSimulatorArm64: String? = null,
     val macosX64: String? = null,
+    val macosArm64: String? = null,
     val tvosX64: String? = null,
     val tvosArm64: String? = null,
+    val tvosSimulatorArm64: String? = null,
     val watchosX86: String? = null,
     val watchosX64: String? = null,
     val watchosArm32: String? = null,
-    val watchosArm64: String? = null
+    val watchosArm64: String? = null,
+    val watchosSimulatorArm64: String? = null,
 ) : KotlinNativeExportable {
 
     override fun export(project: Project, framework: Framework) {
@@ -28,13 +32,17 @@ data class MultiPlatformLibrary(
             KonanTarget.IOS_X64 -> iosX64
             KonanTarget.IOS_ARM32 -> iosArm32
             KonanTarget.IOS_ARM64 -> iosArm64
+            KonanTarget.IOS_SIMULATOR_ARM64 -> iosSimulatorArm64
             KonanTarget.MACOS_X64 -> macosX64
+            KonanTarget.MACOS_ARM64 -> macosArm64
             KonanTarget.TVOS_ARM64 -> tvosArm64
             KonanTarget.TVOS_X64 -> tvosX64
+            KonanTarget.TVOS_SIMULATOR_ARM64 -> tvosSimulatorArm64
             KonanTarget.WATCHOS_X86 -> watchosX86
             KonanTarget.WATCHOS_X64 -> watchosX64
             KonanTarget.WATCHOS_ARM32 -> watchosArm32
             KonanTarget.WATCHOS_ARM64 -> watchosArm64
+            KonanTarget.WATCHOS_SIMULATOR_ARM64 -> watchosSimulatorArm64
             else -> return
         }
         exportArtifact?.let { framework.export(it) }
@@ -47,17 +55,21 @@ fun DependencyHandlerScope.mppLibrary(configuration: String, library: MultiPlatf
     // ios
     library.iosArm32?.let { "iosArm32$configuration"(it) }
     library.iosArm64?.let { "iosArm64$configuration"(it) }
+    library.iosSimulatorArm64?.let { "iosSimulatorArm64$configuration"(it) }
     library.iosX64?.let { "iosX64$configuration"(it) }
     // macos
     library.macosX64?.let { "macosX64$configuration"(it) }
+    library.macosArm64?.let { "macosArm64$configuration"(it) }
     // tvos
     library.tvosArm64?.let { "tvosArm64$configuration"(it) }
     library.tvosX64?.let { "tvosX64$configuration"(it) }
+    library.tvosSimulatorArm64?.let { "tvosSimulatorArm64$configuration"(it) }
     // watchos
     library.watchosX86?.let { "watchosX86$configuration"(it) }
     library.watchosX64?.let { "watchosX64$configuration"(it) }
     library.watchosArm32?.let { "watchosArm32$configuration"(it) }
     library.watchosArm64?.let { "watchosArm64$configuration"(it) }
+    library.watchosSimulatorArm64?.let { "watchosSimulatorArm64$configuration"(it) }
 }
 
 fun DependencyHandlerScope.mppLibrary(library: MultiPlatformLibrary) {
@@ -83,11 +95,15 @@ fun String.defaultMPL(
         iosX64 = if (ios) commonToPlatformArtifact(this, "iosx64") else null,
         iosArm32 = if (ios) commonToPlatformArtifact(this, "iosarm32") else null,
         iosArm64 = if (ios) commonToPlatformArtifact(this, "iosarm64") else null,
+        iosSimulatorArm64 = if (ios) commonToPlatformArtifact(this, "iosSimulatorArm64") else null,
         macosX64 = if (macos) commonToPlatformArtifact(this, "macosx64") else null,
+        macosArm64 = if (macos) commonToPlatformArtifact(this, "macosArm64") else null,
         tvosX64 = if (tvos) commonToPlatformArtifact(this, "tvosx64") else null,
         tvosArm64 = if (tvos) commonToPlatformArtifact(this, "tvosarm64") else null,
+        tvosSimulatorArm64 = if (ios) commonToPlatformArtifact(this, "tvosSimulatorArm64") else null,
         watchosArm32 = if (watchos) commonToPlatformArtifact(this, "watchosarm32") else null,
         watchosArm64 = if (watchos) commonToPlatformArtifact(this, "watchosarm64") else null,
+        watchosSimulatorArm64 = if (ios) commonToPlatformArtifact(this, "watchosSimulatorArm64") else null,
         watchosX86 = if (watchos) commonToPlatformArtifact(this, "watchosx86") else null,
         watchosX64 = if (watchos) commonToPlatformArtifact(this, "watchosx64") else null
     )

src/main/kotlin/dev/icerock/gradle/CocoapodsPlugin.kt

@@ -121,6 +121,7 @@ class CocoapodsPlugin : Plugin<Project> {
         val (sdk, arch) = when (kotlinNativeTarget.konanTarget) {
             KonanTarget.IOS_ARM64 -> "iphoneos" to "arm64"
             KonanTarget.IOS_X64 -> "iphonesimulator" to "x86_64"
+            KonanTarget.IOS_SIMULATOR_ARM64 -> "iphonesimulator" to "arm64"
             else -> throw IllegalArgumentException("${kotlinNativeTarget.konanTarget} is unsupported")
         }
         val taskName = generateCompileCocoaPodTaskName(kotlinNativeTarget, pod)
@@ -146,6 +147,7 @@ class CocoapodsPlugin : Plugin<Project> {
         val (sdk, arch) = when (kotlinNativeTarget.konanTarget) {
             KonanTarget.IOS_ARM64 -> "iphoneos" to "arm64"
             KonanTarget.IOS_X64 -> "iphonesimulator" to "x86_64"
+            KonanTarget.IOS_SIMULATOR_ARM64 -> "iphonesimulator" to "arm64"
             else -> throw IllegalArgumentException("${kotlinNativeTarget.konanTarget} is unsupported")
         }
         val capitalizedPodName = pod.capitalizedModule

src/main/kotlin/dev/icerock/gradle/MobileTargetsPlugin.kt

@@ -6,7 +6,9 @@ package dev.icerock.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.get
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 
 class MobileTargetsPlugin : Plugin<Project> {
     private val androidManifestPlugin = AndroidManifestPlugin()
@@ -29,25 +31,40 @@ class MobileTargetsPlugin : Plugin<Project> {
         kmpExtension: KotlinMultiplatformExtension,
         project: Project
     ) {
-        val logTargetTypeStr = project.findProperty(PROPERTY_IOS_WARNING) as? String
-        val logTargetType = logTargetTypeStr?.toLowerCase() != "false"
         kmpExtension.apply {
             android()
-            val useShortcutStr = project.findProperty(PROPERTY_USE_IOS_SHORTCUT) as? String
-            val useShortcut = useShortcutStr?.toLowerCase() != "false"
+            val useShortcut = project.boolProperty(PROPERTY_USE_IOS_SHORTCUT) ?: true
+            val useIosSimulatorArm64 =
+                project.boolProperty(PROPERTY_WITHOUT_IOS_SIMULATOR_ARM64) ?: true
             if (useShortcut) {
-                if (logTargetType) project.logger.warn("used new ios() shortcut target")
                 ios()
             } else {
-                if (logTargetType) project.logger.warn("used old iosArm64() and iosX64() targets")
                 iosArm64()
                 iosX64()
             }
+            if (useIosSimulatorArm64) {
+                iosSimulatorArm64()
+                if (useShortcut) {
+                    val iosMain: KotlinSourceSet = sourceSets["iosMain"]
+                    val iosSimulatorArm64Main: KotlinSourceSet = sourceSets["iosSimulatorArm64Main"]
+                    iosSimulatorArm64Main.dependsOn(iosMain)
+
+                    val iosTest: KotlinSourceSet = sourceSets["iosTest"]
+                    val iosSimulatorArm64Test: KotlinSourceSet = sourceSets["iosSimulatorArm64Test"]
+                    iosSimulatorArm64Test.dependsOn(iosTest)
+                }
+            }
         }
     }
 
+    private fun Project.boolProperty(name: String): Boolean? {
+        val valueString: String = project.findProperty(name) as? String ?: return null
+        return valueString.toLowerCase() == "true"
+    }
+
     private companion object {
-        const val PROPERTY_IOS_WARNING = "mobile.multiplatform.iosTargetWarning"
         const val PROPERTY_USE_IOS_SHORTCUT = "mobile.multiplatform.useIosShortcut"
+        const val PROPERTY_WITHOUT_IOS_SIMULATOR_ARM64 =
+            "mobile.multiplatform.withoutIosSimulatorArm64"
     }
 }