Skip to content

Commit 5c7cf41

Browse files
committed
Adjusted emulator matrix.
1 parent 9cc1ae4 commit 5c7cf41

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

convention-plugin-test-option/src/main/kotlin/EmulatorJobsMatrix.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import com.google.gson.GsonBuilder
22
import org.gradle.api.Project
3+
import utils.TargetPlatform
4+
import utils.toTargetPlatforms
35
import java.io.File
46
import java.util.Properties
57

@@ -34,7 +36,8 @@ class EmulatorJobsMatrix {
3436

3537
fun getIosTestTaskList(rootProject: Project): List<List<String>> =
3638
rootProject.subprojects.filter { subProject ->
37-
subProject.name == "test-utils"
39+
(subProject.property("${subProject.name}.supportedTargets") as String).toTargetPlatforms().contains(
40+
TargetPlatform.Ios) || subProject.name == "test-utils"
3841
}.map { subProject ->
3942
when (val osArch = System.getProperty("os.arch")) {
4043
"arm64", "arm-v8", "aarch64" -> "${subProject.path}:iosSimulatorArm64Test"
@@ -44,7 +47,8 @@ class EmulatorJobsMatrix {
4447

4548
fun getMacosTestTaskList(rootProject: Project): List<List<String>> =
4649
rootProject.subprojects.filter { subProject ->
47-
subProject.name == "test-utils"
50+
(subProject.property("${subProject.name}.supportedTargets") as String).toTargetPlatforms().contains(
51+
TargetPlatform.Macos) || subProject.name == "test-utils"
4852
}.map { subProject ->
4953
when (val osArch = System.getProperty("os.arch")) {
5054
"arm64", "arm-v8", "aarch64" -> "${subProject.path}:macosArm64Test"
@@ -54,7 +58,8 @@ class EmulatorJobsMatrix {
5458

5559
fun getTvosTestTaskList(rootProject: Project): List<List<String>> =
5660
rootProject.subprojects.filter { subProject ->
57-
subProject.name == "test-utils"
61+
(subProject.property("${subProject.name}.supportedTargets") as String).toTargetPlatforms().contains(
62+
TargetPlatform.Tvos) || subProject.name == "test-utils"
5863
}.map { subProject ->
5964
when (val osArch = System.getProperty("os.arch")) {
6065
"arm64", "arm-v8", "aarch64" -> "${subProject.path}:tvosSimulatorArm64Test"
@@ -64,14 +69,16 @@ class EmulatorJobsMatrix {
6469

6570
fun getJsTestTaskList(rootProject: Project): List<List<String>> =
6671
rootProject.subprojects.filter { subProject ->
67-
subProject.name == "test-utils"
72+
(subProject.property("${subProject.name}.supportedTargets") as String).toTargetPlatforms().contains(
73+
TargetPlatform.Js) || subProject.name == "test-utils"
6874
}.map { subProject ->
6975
"${subProject.path}:jsTest"
7076
}.map { listOf("cleanTest", it) }
7177

7278
fun getJvmTestTaskList(rootProject: Project): List<List<String>> =
7379
rootProject.subprojects.filter { subProject ->
74-
subProject.name == "test-utils"
80+
(subProject.property("${subProject.name}.supportedTargets") as String).toTargetPlatforms().contains(
81+
TargetPlatform.Jvm) || subProject.name == "test-utils"
7582
}.map { subProject ->
7683
"${subProject.path}:jvmTest"
7784
}.map { listOf("cleanTest", it) }

0 commit comments

Comments
 (0)