Fixed issues for AndroidUnitTest

Author: Daeda88

build.gradle.kts

@@ -172,8 +172,7 @@ 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-common"))
-            "commonTestImplementation"(kotlin("test-annotations-common"))
+            "commonTestImplementation"(kotlin("test"))
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
             if (this@afterEvaluate.name != "firebase-crashlytics") {
@@ -187,6 +186,12 @@ subprojects {
         }
     }
 
+    // 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")
@@ -245,18 +250,12 @@ subprojects {
         }
 
     }
-
-    // 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"
-    }
 }
 
 tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
 
     fun isNonStable(version: String): Boolean {
-        val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
+        val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase(java.util.Locale.ENGLISH).contains(it) }
         val versionMatch = "^[0-9,.v-]+(-r)?$".toRegex().matches(version)
 
         return (stableKeyword || versionMatch).not()

firebase-app/build.gradle.kts

@@ -102,7 +102,11 @@ kotlin {
             }
         }
 
-        val commonTest by getting
+        val commonTest by getting {
+            dependencies {
+                implementation(project(":test-utils"))
+            }
+        }
 
         getByName("androidMain") {
             dependencies {

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

@@ -10,3 +10,4 @@ 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()

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase
+
+import org.junit.Ignore
+
+actual val context: Any = ""
+
+actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
+
+// Tests are to be run on AndroidInstrumentedTests.
+// Kotlin 1.8 does not allow us to remove the commonTest dependency from AndroidUnitTest
+// Therefore we just wont run them
+// Kotlin 1.9 will introduce methods for disabling tests properly
+actual typealias IgnoreForAndroidUnitTest = Ignore

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

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

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

@@ -20,3 +20,5 @@ actual fun runTest(test: suspend () -> Unit) = runBlocking {
     }
     testRun.await()
 }
+
+actual annotation class IgnoreForAndroidUnitTest()

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

@@ -10,4 +10,6 @@ actual val context: Any = Unit
 
 actual fun runTest(test: suspend () -> Unit) {
     runTest { test() }
-}
+}
+
+actual annotation class IgnoreForAndroidUnitTest()

firebase-auth/build.gradle.kts

@@ -116,7 +116,11 @@ kotlin {
             }
         }
 
-        val commonTest by getting
+        val commonTest by getting {
+            dependencies {
+                implementation(project(":test-utils"))
+            }
+        }
 
         getByName("androidMain") {
             dependencies {

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

@@ -12,3 +12,5 @@ actual val emulatorHost: String = "10.0.2.2"
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 
 actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
+
+actual annotation class IgnoreForAndroidUnitTest()

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

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.auth
+
+import org.junit.Ignore
+
+actual val emulatorHost: String = "10.0.2.2"
+
+actual val context: Any = ""
+
+actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
+
+// Tests are to be run on AndroidInstrumentedTests.
+// Kotlin 1.8 does not allow us to remove the commonTest dependency from AndroidUnitTest
+// Therefore we just wont run them
+// Kotlin 1.9 will introduce methods for disabling tests properly
+actual typealias IgnoreForAndroidUnitTest = Ignore