Added tier3 targets #3748 (#3761)

<!-- 
If this PR updates documentation, please update all relevant versions of
the docs, see:
https://github.com/kotest/kotest/tree/master/documentation/versioned_docs
The documentation at
https://github.com/kotest/kotest/tree/master/documentation/docs is the
documentation for the next minor or major version _TO BE RELEASED_
-->

Closes #3748

.github/workflows/PR.yml

@@ -43,6 +43,7 @@ jobs:
                - jvmTest
                - jsTest
                - linuxX64Test linuxArm64TestKlibrary
+               - androidNativeX86TestKlibrary androidNativeX64TestKlibrary androidNativeArm32TestKlibrary androidNativeArm64TestKlibrary
                - :kotest-framework:kotest-framework-multiplatform-plugin-gradle:test
       steps:
          -  name: Checkout the repo
@@ -83,8 +84,8 @@ jobs:
             target:
                - macosX64Test macosArm64Test
                - iosX64Test iosSimulatorArm64Test iosArm64TestKlibrary iosArm32TestKlibrary
-               - tvosX64Test tvosArm64TestKlibrary
-               - watchosArm32TestKlibrary watchosArm64TestKlibrary watchosX86Test watchosX64Test
+               - tvosX64Test tvosArm64TestKlibrary tvosSimulatorArm64Test
+               - watchosArm32TestKlibrary watchosArm64TestKlibrary watchosX86Test watchosX64Test watchosSimulatorArm64Test watchosDeviceArm64TestKlibrary
 
       steps:
          -  name: Checkout the repo

.github/workflows/master.yml

@@ -48,6 +48,8 @@ jobs:
                - jsTest publishJsPublicationToDeployRepository
                - linuxX64Test publishLinuxX64PublicationToDeployRepository
                - linuxArm64TestKlibrary publishLinuxArm64PublicationToDeployRepository
+               - androidNativeX86TestKlibrary androidNativeX64TestKlibrary publishAndroidNativeX64PublicationToDeployRepository publishAndroidNativeX86PublicationToDeployRepository
+               - androidNativeArm32Klibrary androidNativeArm64TestKlibrary publishAndroidNativeArm32PublicationToDeployRepository publishAndroidNativeArm64PublicationToDeployRepository
       steps:
          -  uses: kotest/kotest-action@master
             with:

buildSrc/src/main/kotlin/kotest-android-native-conventions.gradle.kts

@@ -0,0 +1,34 @@
+@file:Suppress("UNUSED_VARIABLE")
+
+plugins {
+   id("kotlin-conventions")
+}
+
+kotlin {
+   if (!project.hasProperty(Ci.JVM_ONLY)) {
+      androidNativeX86()
+      androidNativeX64()
+      androidNativeArm32()
+      androidNativeArm64()
+      sourceSets {
+
+         // Main source sets
+         val commonMain by getting {}
+         val desktopMain by getting { dependsOn(commonMain) }
+         val androidNativeX86Main by getting { dependsOn(desktopMain) }
+         val androidNativeX64Main by getting { dependsOn(desktopMain) }
+         val androidNativeArm32Main by getting { dependsOn(desktopMain) }
+         val androidNativeArm64Main by getting { dependsOn(desktopMain) }
+
+         val commonTest by getting
+         val nativeTest by getting { dependsOn(commonTest) }
+         val androidNativeX86Test by getting { dependsOn(nativeTest) }
+         val androidNativeX64Test by getting { dependsOn(nativeTest) }
+         val androidNativeArm32Test by getting { dependsOn(nativeTest) }
+         val androidNativeArm64Test by getting { dependsOn(nativeTest) }
+      }
+   } else {
+      // Make sure every project has at least one valid target, otherwise Kotlin compiler will complain
+      jvm()
+   }
+}

buildSrc/src/main/kotlin/kotest-native-conventions.gradle.kts

@@ -14,7 +14,8 @@ kotlin {
       macosX64()
       macosArm64()
 
-      tvos()
+      tvosX64()
+      tvosArm64()
       tvosSimulatorArm64()
 
       watchosArm32()
@@ -56,7 +57,8 @@ kotlin {
          val watchosX64Main by getting { dependsOn(desktopMain) }
          val watchosSimulatorArm64Main by getting { dependsOn(desktopMain) }
 
-         val tvosMain by getting { dependsOn(desktopMain) }
+         val tvosX64Main by getting { dependsOn(desktopMain) }
+         val tvosArm64Main by getting { dependsOn(desktopMain) }
          val tvosSimulatorArm64Main by getting { dependsOn(desktopMain) }
 
          // Test sourcesets
@@ -83,7 +85,8 @@ kotlin {
          val watchosX64Test by getting { dependsOn(nativeTest) }
          val watchosSimulatorArm64Test by getting { dependsOn(nativeTest) }
 
-         val tvosTest by getting { dependsOn(nativeTest) }
+         val tvosX64Test by getting { dependsOn(nativeTest) }
+         val tvosArm64Test by getting { dependsOn(nativeTest) }
          val tvosSimulatorArm64Test by getting { dependsOn(nativeTest) }
       }
    } else {

buildSrc/src/main/kotlin/kotest-watchos-device-conventions.gradle.kts

@@ -0,0 +1,26 @@
+@file:Suppress("UNUSED_VARIABLE")
+
+plugins {
+   id("kotlin-conventions")
+}
+
+kotlin {
+   if (!project.hasProperty(Ci.JVM_ONLY)) {
+      watchosDeviceArm64()
+      sourceSets {
+
+         // Main source sets
+         val commonMain by getting {}
+         val desktopMain by getting { dependsOn(commonMain) }
+         val watchosDeviceArm64Main by getting { dependsOn(desktopMain) }
+
+         // Test sourcesets
+         val commonTest by getting
+         val nativeTest by getting { dependsOn(commonTest) }
+         val watchosDeviceArm64Test by getting { dependsOn(nativeTest) }
+      }
+   } else {
+      // Make sure every project has at least one valid target, otherwise Kotlin compiler will complain
+      jvm()
+   }
+}

kotest-assertions/kotest-assertions-api/build.gradle.kts

@@ -1,3 +1,5 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }

kotest-assertions/kotest-assertions-core/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {

kotest-assertions/kotest-assertions-shared/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {

kotest-common/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {

kotest-framework/kotest-framework-api/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {

kotest-framework/kotest-framework-datatest/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {

kotest-framework/kotest-framework-engine/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {

kotest-property/build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
    id("kotest-multiplatform-library-conventions")
+   id("kotest-android-native-conventions")
+   id("kotest-watchos-device-conventions")
 }
 
 kotlin {