Cleanup/test fixes

Author: Daeda88

build.gradle.kts

@@ -113,7 +113,8 @@ subprojects {
             "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
             "androidMainImplementation"(platform("com.google.firebase:firebase-bom:$firebaseBoMVersion"))
-            "commonTestImplementation"(kotlin("test"))
+            "commonTestImplementation"(kotlin("test-common"))
+            "commonTestImplementation"(kotlin("test-annotations-common"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
             if (this@afterEvaluate.name != "firebase-crashlytics") {
@@ -126,19 +127,14 @@ subprojects {
                 "jvmTestImplementation"("junit:junit:4.13.2")
             }
             "androidInstrumentedTestImplementation"(kotlin("test-junit"))
+            "androidUnitTestImplementation"(kotlin("test-junit"))
             "androidInstrumentedTestImplementation"("junit:junit:4.13.2")
             "androidInstrumentedTestImplementation"("androidx.test:core:1.5.0")
             "androidInstrumentedTestImplementation"("androidx.test.ext:junit:1.1.5")
             "androidInstrumentedTestImplementation"("androidx.test:runner:1.5.2")
         }
     }
 
-    // Workaround for setting kotlinOptions.jvmTarget
-    // See https://youtrack.jetbrains.com/issue/KT-55947/Unable-to-set-kapt-jvm-target-version
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        kotlinOptions.jvmTarget = "11"
-    }
-
     if (skipPublishing) return@subprojects
 
     apply(plugin = "maven-publish")

firebase-app/build.gradle.kts

@@ -46,8 +46,13 @@ val supportIosTarget = project.property("skipIosTarget") != "true"
 
 kotlin {
 
-    androidTarget() {
+    androidTarget {
         publishAllLibraryVariants()
+        compilations.configureEach {
+            kotlinOptions {
+                jvmTarget = "11"
+            }
+        }
     }
 
     jvm {

firebase-app/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -10,4 +10,5 @@ import androidx.test.platform.app.InstrumentationRegistry
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 
 actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
-actual annotation class IgnoreForAndroidUnitTest()
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidUnitTest

firebase-app/src/commonTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -4,7 +4,7 @@ import kotlin.test.Test
 
 expect val context: Any
 expect fun runTest(test: suspend () -> Unit)
-expect annotation class IgnoreForAndroidUnitTest constructor()
+expect annotation class IgnoreForAndroidUnitTest()
 
 @IgnoreForAndroidUnitTest
 class FirebaseAppTest {

firebase-app/src/iosTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -21,4 +21,5 @@ actual fun runTest(test: suspend () -> Unit) = runBlocking {
     testRun.await()
 }
 
-actual annotation class IgnoreForAndroidUnitTest()
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidUnitTest

firebase-app/src/jsTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -12,4 +12,5 @@ actual fun runTest(test: suspend () -> Unit) {
     runTest { test() }
 }
 
-actual annotation class IgnoreForAndroidUnitTest()
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidUnitTest

firebase-app/src/jvmTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -8,3 +8,5 @@ package dev.gitlive.firebase
 actual val context: Any = Unit
 
 actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidUnitTest

firebase-auth/build.gradle.kts

@@ -62,6 +62,11 @@ kotlin {
 
     androidTarget {
         publishAllLibraryVariants()
+        compilations.configureEach {
+            kotlinOptions {
+                jvmTarget = "11"
+            }
+        }
     }
 
     if (supportIosTarget) {
@@ -120,6 +125,7 @@ kotlin {
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
+                    optIn("kotlinx.cinterop.BetaInteropApi")
                 }
             }
         }

firebase-auth/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -13,4 +13,5 @@ actual val context: Any = InstrumentationRegistry.getInstrumentation().targetCon
 
 actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
 
-actual annotation class IgnoreForAndroidUnitTest()
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidUnitTest

firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt

@@ -12,7 +12,7 @@ import kotlin.test.*
 expect val emulatorHost: String
 expect val context: Any
 expect fun runTest(test: suspend () -> Unit): TestResult
-expect annotation class IgnoreForAndroidUnitTest constructor()
+expect annotation class IgnoreForAndroidUnitTest()
 
 @IgnoreForAndroidUnitTest
 class FirebaseAuthTest {