Merge pull request #94 from arkivanov/parallel-non-native-build

arkivanov · web-flow · commit 4154ea25f2ea · 2020-06-28T23:06:36.000+01:00
Parallel non-native build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,8 +3,32 @@ name: Build
 on: [pull_request]
 
 jobs:
-  non-native-build:
-    name: Build JVM, Android, JS
+  android-build:
+    name: Build Android
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Install Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build Android
+        run: ./gradlew build -Pbuild_type=ANDROID
+  jvm-build:
+    name: Build JVM
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Install Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build JVM
+        run: ./gradlew build -Pbuild_type=JVM
+  js-build:
+    name: Build JS
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -17,8 +41,8 @@ jobs:
         run: sudo apt-get update
       - name: Install dependencies
         run: sudo apt-get install nodejs chromium-browser
-      - name: Build JVM, Android, JS
-        run: ./gradlew :utils-internal:build :rx:build :rx-internal:build :mvikotlin:build :mvikotlin-test-internal:build :mvikotlin-main:build :mvikotlin-logging:build :mvikotlin-timetravel-proto-internal:build :mvikotlin-timetravel:build :mvikotlin-timetravel-client:client-internal:build :mvikotlin-timetravel-client:plugin-idea:build :mvikotlin-extensions-reaktive:build :mvikotlin-extensions-coroutines:build :androidx-lifecycle-interop:build :sample:todo-app-android:assembleDebug :sample:todo-app-js:build -Pbuild_type=NON_NATIVE
+      - name: Build JS
+        run: ./gradlew build -Pbuild_type=JS
   linux-build:
     name: Build Linux
     runs-on: ubuntu-latest
@@ -30,7 +54,7 @@ jobs:
         with:
           java-version: 1.8
       - name: Build Linux
-        run: ./gradlew :utils-internal:build :rx:build :rx-internal:build :mvikotlin:build :mvikotlin-test-internal:build :mvikotlin-main:build :mvikotlin-logging:build :mvikotlin-timetravel-proto-internal:build :mvikotlin-timetravel:build :mvikotlin-extensions-reaktive:build :mvikotlin-extensions-coroutines:build -Pbuild_type=LINUX
+        run: ./gradlew build -Pbuild_type=LINUX
   ios-build:
     name: Build iOS
     runs-on: macos-latest
@@ -42,7 +66,7 @@ jobs:
         with:
           java-version: 1.8
       - name: Build iOS
-        run: ./gradlew :utils-internal:build :rx:build :rx-internal:build :mvikotlin:build :mvikotlin-test-internal:build :mvikotlin-main:build :mvikotlin-logging:build :mvikotlin-timetravel-proto-internal:build :mvikotlin-timetravel:build :mvikotlin-extensions-reaktive:build :mvikotlin-extensions-coroutines:build :sample:todo-darwin-umbrella:iosX64MainBinaries :sample:todo-darwin-umbrella:iosArm64MainBinaries -Pbuild_type=IOS
+        run: ./gradlew build -Pbuild_type=IOS
   macos-build:
     name: Build macOS
     runs-on: macos-latest
@@ -54,4 +78,4 @@ jobs:
         with:
           java-version: 1.8
       - name: Build macOS
-        run: ./gradlew :utils-internal:build :rx:build :rx-internal:build :mvikotlin:build :mvikotlin-test-internal:build :mvikotlin-main:build :mvikotlin-logging:build :mvikotlin-timetravel-proto-internal:build :mvikotlin-timetravel:build :mvikotlin-timetravel-client:client-internal:build :mvikotlin-extensions-reaktive:build :mvikotlin-extensions-coroutines:build :sample:todo-darwin-umbrella:macosX64MainBinaries -Pbuild_type=MAC_OS
+        run: ./gradlew build -Pbuild_type=MAC_OS
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 enum class BuildType {
-    ALL, METADATA, NON_NATIVE, LINUX, IOS, MAC_OS
+    ALL, METADATA, NON_NATIVE, ANDROID, JVM, JS, LINUX, IOS, MAC_OS
 }
 
 val ExtensionAware.buildType: BuildType
@@ -69,6 +69,9 @@ private val BUILD_TYPE_TO_BUILD_TARGETS: Map<BuildType, Set<BuildTarget>> =
         BuildType.ALL to ALL_BUILD_TARGETS,
         BuildType.METADATA to ALL_BUILD_TARGETS,
         BuildType.NON_NATIVE to setOf(BuildTarget.Android, BuildTarget.Jvm, BuildTarget.Js),
+        BuildType.ANDROID to setOf(BuildTarget.Android),
+        BuildType.JVM to setOf(BuildTarget.Jvm),
+        BuildType.JS to setOf(BuildTarget.Js),
         BuildType.LINUX to setOf(BuildTarget.LinuxX64),
         BuildType.IOS to setOf(BuildTarget.IosX64, BuildTarget.IosArm64),
         BuildType.MAC_OS to setOf(BuildTarget.MacOsX64)
diff --git a/sample/todo-common-internal/build.gradle.kts b/sample/todo-common-internal/build.gradle.kts
@@ -1,3 +1,5 @@
+buildTargets = setOf(BuildTarget.Android, BuildTarget.Js, BuildTarget.IosX64, BuildTarget.IosArm64)
+
 setupMultiplatform()
 
 kotlin {
diff --git a/sample/todo-common/build.gradle.kts b/sample/todo-common/build.gradle.kts
@@ -1,3 +1,5 @@
+buildTargets = setOf(BuildTarget.Android, BuildTarget.Js, BuildTarget.IosX64, BuildTarget.IosArm64)
+
 setupMultiplatform()
 setupXcodeSync()
 
diff --git a/sample/todo-coroutines/build.gradle.kts b/sample/todo-coroutines/build.gradle.kts
@@ -1,3 +1,5 @@
+buildTargets = setOf(BuildTarget.Android, BuildTarget.Js)
+
 setupMultiplatform()
 
 kotlin {
diff --git a/sample/todo-darwin-umbrella/build.gradle.kts b/sample/todo-darwin-umbrella/build.gradle.kts
@@ -1,5 +1,7 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
+buildTargets = setOf(BuildTarget.IosX64, BuildTarget.IosArm64)
+
 setupMultiplatform()
 
 kotlin {
diff --git a/sample/todo-reaktive/build.gradle.kts b/sample/todo-reaktive/build.gradle.kts
@@ -1,3 +1,5 @@
+buildTargets = setOf(BuildTarget.Android, BuildTarget.Js, BuildTarget.IosX64, BuildTarget.IosArm64)
+
 setupMultiplatform()
 setupXcodeSync()
 
diff --git a/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/controller/TodoDetailsReaktiveControllerTest.kt b/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/controller/TodoDetailsReaktiveControllerTest.kt
@@ -4,6 +4,7 @@ import com.arkivanov.mvikotlin.core.lifecycle.Lifecycle
 import com.arkivanov.mvikotlin.core.lifecycle.LifecycleRegistry
 import com.arkivanov.mvikotlin.core.lifecycle.resume
 import com.arkivanov.mvikotlin.core.store.StoreFactory
+import com.arkivanov.mvikotlin.core.utils.isAssertOnMainThreadEnabled
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
 import com.arkivanov.mvikotlin.sample.todo.common.controller.TodoDetailsController
 import com.arkivanov.mvikotlin.sample.todo.common.controller.TodoDetailsController.Dependencies
@@ -47,11 +48,14 @@ class TodoDetailsReaktiveControllerTest {
     fun before() {
         overrideSchedulers(main = { TestScheduler() }, io = { TestScheduler() })
         reaktiveUncaughtErrorHandler = { throw it }
+        isAssertOnMainThreadEnabled = false
     }
 
     @AfterTest
     fun after() {
+        overrideSchedulers()
         resetReaktiveUncaughtErrorHandler()
+        isAssertOnMainThreadEnabled = true
     }
 
     @Test
diff --git a/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/controller/TodoListReaktiveControllerTest.kt b/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/controller/TodoListReaktiveControllerTest.kt
@@ -5,6 +5,7 @@ import com.arkivanov.mvikotlin.core.lifecycle.LifecycleRegistry
 import com.arkivanov.mvikotlin.core.lifecycle.resume
 import com.arkivanov.mvikotlin.core.statekeeper.StateKeeperProvider
 import com.arkivanov.mvikotlin.core.store.StoreFactory
+import com.arkivanov.mvikotlin.core.utils.isAssertOnMainThreadEnabled
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
 import com.arkivanov.mvikotlin.sample.todo.common.controller.TodoListController
 import com.arkivanov.mvikotlin.sample.todo.common.controller.TodoListController.Dependencies
@@ -48,11 +49,14 @@ class TodoListReaktiveControllerTest {
     fun before() {
         overrideSchedulers(main = { TestScheduler() }, io = { TestScheduler() })
         reaktiveUncaughtErrorHandler = { throw it }
+        isAssertOnMainThreadEnabled = false
     }
 
     @AfterTest
     fun after() {
+        overrideSchedulers()
         resetReaktiveUncaughtErrorHandler()
+        isAssertOnMainThreadEnabled = true
     }
 
     @Test
diff --git a/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/store/TodoAddStoreTest.kt b/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/store/TodoAddStoreTest.kt
@@ -1,5 +1,6 @@
 package com.arkivanov.mvikotlin.sample.todo.reaktive.store
 
+import com.arkivanov.mvikotlin.core.utils.isAssertOnMainThreadEnabled
 import com.arkivanov.mvikotlin.extensions.reaktive.labels
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
 import com.arkivanov.mvikotlin.sample.todo.common.database.TodoItem
@@ -28,12 +29,14 @@ class TodoAddStoreTest {
     fun before() {
         overrideSchedulers(main = { TestScheduler() }, io = { TestScheduler() })
         reaktiveUncaughtErrorHandler = { throw it }
+        isAssertOnMainThreadEnabled = false
     }
 
     @AfterTest
     fun after() {
         overrideSchedulers()
         resetReaktiveUncaughtErrorHandler()
+        isAssertOnMainThreadEnabled = true
     }
 
     @Test
diff --git a/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/store/TodoDetailsStoreTest.kt b/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/store/TodoDetailsStoreTest.kt
@@ -1,5 +1,6 @@
 package com.arkivanov.mvikotlin.sample.todo.reaktive.store
 
+import com.arkivanov.mvikotlin.core.utils.isAssertOnMainThreadEnabled
 import com.arkivanov.mvikotlin.extensions.reaktive.labels
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
 import com.arkivanov.mvikotlin.sample.todo.common.database.TodoItem
@@ -31,6 +32,7 @@ class TodoDetailsStoreTest {
     fun before() {
         overrideSchedulers(main = { TestScheduler() }, io = { TestScheduler() })
         reaktiveUncaughtErrorHandler = { throw it }
+        isAssertOnMainThreadEnabled = false
 
         itemId = database.create(itemData).id
     }
@@ -39,6 +41,7 @@ class TodoDetailsStoreTest {
     fun after() {
         overrideSchedulers()
         resetReaktiveUncaughtErrorHandler()
+        isAssertOnMainThreadEnabled = true
     }
 
     @Test
diff --git a/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/store/TodoListStoreTest.kt b/sample/todo-reaktive/src/commonTest/kotlin/com/arkivanov/mvikotlin/sample/todo/reaktive/store/TodoListStoreTest.kt
@@ -1,5 +1,6 @@
 package com.arkivanov.mvikotlin.sample.todo.reaktive.store
 
+import com.arkivanov.mvikotlin.core.utils.isAssertOnMainThreadEnabled
 import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
 import com.arkivanov.mvikotlin.sample.todo.common.database.TodoItem
 import com.arkivanov.mvikotlin.sample.todo.common.internal.store.list.TodoListStore
@@ -27,12 +28,14 @@ class TodoListStoreTest {
     fun before() {
         overrideSchedulers(main = { TestScheduler() }, io = { TestScheduler() })
         reaktiveUncaughtErrorHandler = { throw it }
+        isAssertOnMainThreadEnabled = false
     }
 
     @AfterTest
     fun after() {
         overrideSchedulers()
         resetReaktiveUncaughtErrorHandler()
+        isAssertOnMainThreadEnabled = true
     }
 
     @Test
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,23 +10,22 @@ include(":mvikotlin-logging")
 include(":mvikotlin-timetravel")
 include(":mvikotlin-timetravel-proto-internal")
 include(":mvikotlin-timetravel-client:client-internal")
-include(":mvikotlin-timetravel-client:plugin-idea")
+doIfBuildTargetAvailable<BuildTarget.Jvm> {
+    include(":mvikotlin-timetravel-client:plugin-idea")
+}
 include(":mvikotlin-extensions-reaktive")
 include(":mvikotlin-extensions-coroutines")
 include(":androidx-lifecycle-interop")
 include(":sample:todo-common")
 include(":sample:todo-common-internal")
 include(":sample:todo-reaktive")
 include(":sample:todo-coroutines")
-include(":sample:todo-app-js")
-
-//include(":tools:check-publication")
-
-doIfBuildTargetAvailable<BuildTarget.Darwin> {
-    include(":sample:todo-darwin-umbrella")
-}
-
+include(":sample:todo-darwin-umbrella")
 doIfBuildTargetAvailable<BuildTarget.Android> {
     include(":sample:todo-app-android")
 }
+doIfBuildTargetAvailable<BuildTarget.Js> {
+    include(":sample:todo-app-js")
+}
 
+//include(":tools:check-publication")

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+buildTargets = setOf(BuildTarget.Android, BuildTarget.Js, BuildTarget.IosX64, BuildTarget.IosArm64)`
	`2`	`+`
`1`	`3`	`setupMultiplatform()`
`2`	`4`
`3`	`5`	`kotlin {`