rename jsWasmJsCommon sourceSets to jsCommon ones. commonize `syn…

…chronizedCompat`. cleanup.
badoo · Jan 5, 2024 · 472241c · 472241c
1 parent 7bd804d
commit 472241c
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 23 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,6 @@ detekt = "1.22.0"
 [libraries]
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-kotlin-stdlib-wasm-js = { module = "org.jetbrains.kotlin:kotlin-stdlib-wasm-js", version.ref = "kotlin" }
 
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlin-test-annotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations", version.ref = "kotlin" }

diff --git a/...eConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt b/...eConfiguration/src/main/kotlin/com/badoo/reaktive/configuration/MppConfigurationPlugin.kt
@@ -62,9 +62,6 @@ class MppConfigurationPlugin : Plugin<Project> {
  maybeCreate("jvmJsCommonMain").dependsOn(getByName("commonMain"))
  maybeCreate("jvmJsCommonTest").dependsOn(getByName("commonTest"))
 
- maybeCreate("jsWasmJsCommonMain").dependsOn(getByName("commonMain"))
- maybeCreate("jsWasmJsCommonTest").dependsOn(getByName("commonTest"))
-
  maybeCreate("jvmNativeCommonMain").dependsOn(getByName("commonMain"))
  maybeCreate("jvmNativeCommonTest").dependsOn(getByName("commonTest"))
 
@@ -83,23 +80,14 @@ class MppConfigurationPlugin : Plugin<Project> {
  maybeCreate("androidMain").dependsOn(getByName("jvmCommonMain"))
  maybeCreate("androidUnitTest").dependsOn(getByName("jvmCommonTest"))
 
- maybeCreate("jsMain").apply {
- dependsOn(getByName("jvmJsCommonMain"))
- dependsOn(getByName("jsWasmJsCommonMain"))
- }
- maybeCreate("jsTest").apply {
- dependsOn(getByName("jvmJsCommonTest"))
- dependsOn(getByName("jsWasmJsCommonTest"))
- }
+ maybeCreate("jsCommonMain").dependsOn(getByName("jvmJsCommonMain"))
+ maybeCreate("jsCommonTest").dependsOn(getByName("jvmJsCommonTest"))
 
- maybeCreate("wasmJsMain").apply {
- dependsOn(getByName("jvmJsCommonMain"))
- dependsOn(getByName("jsWasmJsCommonMain"))
- }
- maybeCreate("wasmJsTest").apply {
- dependsOn(getByName("jvmJsCommonTest"))
- dependsOn(getByName("jsWasmJsCommonTest"))
- }
+ maybeCreate("jsMain").dependsOn(getByName("jsCommonMain"))
+ maybeCreate("jsTest").dependsOn(getByName("jsCommonTest"))
+
+ maybeCreate("wasmJsMain").dependsOn(getByName("jsCommonMain"))
+ maybeCreate("wasmJsTest").dependsOn(getByName("jsCommonTest"))
 
  maybeCreate("nativeCommonMain").dependsOn(getByName("jvmNativeCommonMain"))
  maybeCreate("nativeCommonTest").dependsOn(getByName("jvmNativeCommonTest"))

diff --git a/...ive/base/exceptions/CompositeException.kt → ...ive/base/exceptions/CompositeException.kt b/...ive/base/exceptions/CompositeException.kt → ...ive/base/exceptions/CompositeException.kt
diff --git a/.../com/badoo/reaktive/disposable/Various.kt → .../com/badoo/reaktive/disposable/Various.kt b/.../com/badoo/reaktive/disposable/Various.kt → .../com/badoo/reaktive/disposable/Various.kt
diff --git a/...e/scheduler/CreateComputationScheduler.kt → ...e/scheduler/CreateComputationScheduler.kt b/...e/scheduler/CreateComputationScheduler.kt → ...e/scheduler/CreateComputationScheduler.kt
diff --git a/...o/reaktive/scheduler/CreateIoScheduler.kt → ...o/reaktive/scheduler/CreateIoScheduler.kt b/...o/reaktive/scheduler/CreateIoScheduler.kt → ...o/reaktive/scheduler/CreateIoScheduler.kt
diff --git a/...reaktive/scheduler/CreateMainScheduler.kt → ...reaktive/scheduler/CreateMainScheduler.kt b/...reaktive/scheduler/CreateMainScheduler.kt → ...reaktive/scheduler/CreateMainScheduler.kt
diff --git a/...ive/scheduler/CreateNewThreadScheduler.kt → ...ive/scheduler/CreateNewThreadScheduler.kt b/...ive/scheduler/CreateNewThreadScheduler.kt → ...ive/scheduler/CreateNewThreadScheduler.kt
diff --git a/...aktive/scheduler/CreateSingleScheduler.kt → ...aktive/scheduler/CreateSingleScheduler.kt b/...aktive/scheduler/CreateSingleScheduler.kt → ...aktive/scheduler/CreateSingleScheduler.kt
diff --git a/...ve/scheduler/CreateTrampolineScheduler.kt → ...ve/scheduler/CreateTrampolineScheduler.kt b/...ve/scheduler/CreateTrampolineScheduler.kt → ...ve/scheduler/CreateTrampolineScheduler.kt
diff --git a/...m/badoo/reaktive/scheduler/JsFunctions.kt → ...m/badoo/reaktive/scheduler/JsFunctions.kt b/...m/badoo/reaktive/scheduler/JsFunctions.kt → ...m/badoo/reaktive/scheduler/JsFunctions.kt
diff --git a/...badoo/reaktive/scheduler/MainScheduler.kt → ...badoo/reaktive/scheduler/MainScheduler.kt b/...badoo/reaktive/scheduler/MainScheduler.kt → ...badoo/reaktive/scheduler/MainScheduler.kt
diff --git a/...tils/CreateDefaultUncaughtErrorHandler.kt → ...tils/CreateDefaultUncaughtErrorHandler.kt b/...tils/CreateDefaultUncaughtErrorHandler.kt → ...tils/CreateDefaultUncaughtErrorHandler.kt
diff --git a/...adoo/reaktive/utils/SynchronizedCompat.kt → ...adoo/reaktive/utils/SynchronizedCompat.kt b/...adoo/reaktive/utils/SynchronizedCompat.kt → ...adoo/reaktive/utils/SynchronizedCompat.kt
diff --git a/...o/reaktive/scheduler/MainSchedulerTest.kt → ...o/reaktive/scheduler/MainSchedulerTest.kt b/...o/reaktive/scheduler/MainSchedulerTest.kt → ...o/reaktive/scheduler/MainSchedulerTest.kt
diff --git a/reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt b/reaktive/src/wasmJsMain/kotlin/com/badoo/reaktive/utils/SynchronizedCompat.kt
diff --git a/...com/badoo/reaktive/utils/CurrentThread.kt → ...com/badoo/reaktive/utils/CurrentThread.kt b/...com/badoo/reaktive/utils/CurrentThread.kt → ...com/badoo/reaktive/utils/CurrentThread.kt
diff --git a/...oo/reaktive/utils/atomic/AtomicBoolean.kt → ...oo/reaktive/utils/atomic/AtomicBoolean.kt b/...oo/reaktive/utils/atomic/AtomicBoolean.kt → ...oo/reaktive/utils/atomic/AtomicBoolean.kt
diff --git a/.../badoo/reaktive/utils/atomic/AtomicInt.kt → .../badoo/reaktive/utils/atomic/AtomicInt.kt b/.../badoo/reaktive/utils/atomic/AtomicInt.kt → .../badoo/reaktive/utils/atomic/AtomicInt.kt
diff --git a/...badoo/reaktive/utils/atomic/AtomicLong.kt → ...badoo/reaktive/utils/atomic/AtomicLong.kt b/...badoo/reaktive/utils/atomic/AtomicLong.kt → ...badoo/reaktive/utils/atomic/AtomicLong.kt
diff --git a/.../reaktive/utils/atomic/AtomicReference.kt → .../reaktive/utils/atomic/AtomicReference.kt b/.../reaktive/utils/atomic/AtomicReference.kt → .../reaktive/utils/atomic/AtomicReference.kt
diff --git a/...adoo/reaktive/utils/lock/ConditionLock.kt → ...adoo/reaktive/utils/lock/ConditionLock.kt b/...adoo/reaktive/utils/lock/ConditionLock.kt → ...adoo/reaktive/utils/lock/ConditionLock.kt
diff --git a/...lin/com/badoo/reaktive/utils/lock/Lock.kt → ...lin/com/badoo/reaktive/utils/lock/Lock.kt b/...lin/com/badoo/reaktive/utils/lock/Lock.kt → ...lin/com/badoo/reaktive/utils/lock/Lock.kt