Added fix for ios targets

Author: Reedyuk

build.gradle.kts

@@ -28,13 +28,13 @@ subprojects {
         jcenter()
     }
 
-    tasks.withType<KotlinCompile<*>> {
-        kotlinOptions.freeCompilerArgs += listOf(
-            "-Xuse-experimental=kotlin.Experimental",
-            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xuse-experimental=kotlinx.serialization.ImplicitReflectionSerializer"
-        )
-    }
+//    tasks.withType<KotlinCompile<*>> {
+//        kotlinOptions.freeCompilerArgs += listOf(
+//            "-Xuse-experimental=kotlin.Experimental",
+//            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+//            "-Xuse-experimental=kotlinx.serialization.ImplicitReflectionSerializer"
+//        )
+//    }
 
     afterEvaluate  {
         dependencies {

firebase-app/build.gradle.kts

@@ -63,7 +63,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(project(":firebase-common"))
+                //implementation(project(":firebase-common"))
             }
         }
         val androidMain by getting {

firebase-auth/build.gradle.kts

@@ -32,21 +32,15 @@ kotlin {
     android {
         publishLibraryVariants("release", "debug")
     }
-    val buildForDevice = project.findProperty("kotlin.native.cocoapods.target") == "ios_arm"
-    val iosMain by sourceSets.creating
-    if (buildForDevice) {
-        iosArm64("ios64")
-        sourceSets["ios64Main"].dependsOn(iosMain)
-    } else {
-        iosX64("ios")
-    }
-    jvm {
-        val main by compilations.getting {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+    val iosArm64 = iosArm64()
+    val iosX64 = iosX64()
+//    jvm {
+//        val main by compilations.getting {
+//            kotlinOptions {
+//                jvmTarget = "1.8"
+//            }
+//        }
+//    }
 
     sourceSets {
         val commonMain by getting {
@@ -60,13 +54,13 @@ kotlin {
                 api("com.google.firebase:firebase-auth:19.1.0")
             }
         }
-        val iosMain by getting {
+        val iosMain by creating {
             dependencies {
             }
         }
-        val jvmMain by getting {
-            kotlin.srcDir("src/androidMain/kotlin")
-        }
+//        val jvmMain by getting {
+//            kotlin.srcDir("src/androidMain/kotlin")
+//        }
     }
 }
 

firebase-firestore/build.gradle.kts

@@ -32,21 +32,15 @@ kotlin {
     android {
         publishLibraryVariants("release", "debug")
     }
-    val buildForDevice = project.findProperty("kotlin.native.cocoapods.target") == "ios_arm"
-    val iosMain by sourceSets.creating
-    if (buildForDevice) {
-        iosArm64("ios64")
-        sourceSets["ios64Main"].dependsOn(iosMain)
-    } else {
-        iosX64("ios")
-    }
-    jvm {
-        val main by compilations.getting {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+    val iosArm64 = iosArm64()
+    val iosX64 = iosX64()
+//    jvm {
+//        val main by compilations.getting {
+//            kotlinOptions {
+//                jvmTarget = "1.8"
+//            }
+//        }
+//    }
 
     sourceSets {
         val commonMain by getting {
@@ -62,7 +56,7 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
             }
         }
-        val iosMain by getting {
+        val iosMain by creating {
             dependencies {
             }
         }

firebase-functions/build.gradle.kts

@@ -32,21 +32,15 @@ kotlin {
     android {
         publishLibraryVariants("release", "debug")
     }
-    val buildForDevice = project.findProperty("kotlin.native.cocoapods.target") == "ios_arm"
-    val iosMain by sourceSets.creating
-    if (buildForDevice) {
-        iosArm64("ios64")
-        sourceSets["ios64Main"].dependsOn(iosMain)
-    } else {
-        iosX64("ios")
-    }
-    jvm {
-        val main by compilations.getting {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+    val iosArm64 = iosArm64()
+    val iosX64 = iosX64()
+//    jvm {
+//        val main by compilations.getting {
+//            kotlinOptions {
+//                jvmTarget = "1.8"
+//            }
+//        }
+//    }
 
     sourceSets {
         val commonMain by getting {
@@ -62,7 +56,7 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
             }
         }
-        val iosMain by getting {
+        val iosMain by creating {
             dependencies {
             }
         }