Re-addeed jvm

Author: Reedyuk

firebase-app/build.gradle.kts

@@ -44,14 +44,6 @@ 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 {
@@ -60,6 +52,9 @@ kotlin {
         }
     }
 
+    val iosArm64 = iosArm64()
+    val iosX64 = iosX64()
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -74,7 +69,7 @@ kotlin {
         val jvmMain by getting {
             kotlin.srcDir("src/androidMain/kotlin")
         }
-        val iosMain by getting {
+        val iosMain by creating {
             dependencies {
             }
         }

firebase-database/build.gradle.kts

@@ -32,13 +32,13 @@ kotlin {
     android {
         publishLibraryVariants("release", "debug")
     }
-    jvm {
-        val main by compilations.getting {
-            kotlinOptions {
-                jvmTarget = "1.8"
-            }
-        }
-    }
+//    jvm {
+//        val main by compilations.getting {
+//            kotlinOptions {
+//                jvmTarget = "1.8"
+//            }
+//        }
+//    }
 
     sourceSets {
         val commonMain by getting {
@@ -54,12 +54,12 @@ kotlin {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
             }
         }
-        val jvmMain by getting {
-            dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
-            }
-            kotlin.srcDir("src/androidMain/kotlin")
-        }
+//        val jvmMain by getting {
+//            dependencies {
+//                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
+//            }
+//            kotlin.srcDir("src/androidMain/kotlin")
+//        }
         val jsMain by getting {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.14.0")

firebase-firestore/build.gradle.kts

@@ -34,13 +34,13 @@ kotlin {
     }
     val iosArm64 = iosArm64()
     val iosX64 = iosX64()
-//    jvm {
-//        val main by compilations.getting {
-//            kotlinOptions {
-//                jvmTarget = "1.8"
-//            }
-//        }
-//    }
+    jvm {
+        val main by compilations.getting {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
 
     sourceSets {
         val commonMain by getting {

firebase-functions/build.gradle.kts

@@ -34,13 +34,13 @@ kotlin {
     }
     val iosArm64 = iosArm64()
     val iosX64 = iosX64()
-//    jvm {
-//        val main by compilations.getting {
-//            kotlinOptions {
-//                jvmTarget = "1.8"
-//            }
-//        }
-//    }
+    jvm {
+        val main by compilations.getting {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
 
     sourceSets {
         val commonMain by getting {