rebase fixes

Kotlin · Jun 22, 2022 · d73156a · d73156a
1 parent 4fa6f95
commit d73156a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/formats/json-tests/build.gradle.kts b/formats/json-tests/build.gradle.kts
@@ -11,6 +11,12 @@ plugins {
 apply(from = rootProject.file("gradle/native-targets.gradle"))
 apply(from = rootProject.file("gradle/configure-source-sets.gradle"))
 
+tasks.withType<SourceTask> {
+    if (this.name == "compileTestKotlinJsLegacy") {
+        this.exclude("**/PropertyInitializerTest.kt")
+    }
+}
+
 // disable kover tasks because there are no non-test classes in the project
 tasks.koverHtmlReport {
     enabled = false
@@ -41,10 +47,4 @@ kotlin {
     }
 }
 
-tasks.withType<SourceTask> {
-    if (this.name == "compileTestKotlinJsLegacy") {
-        this.exclude("**/PropertyInitializerTest.kt")
-    }
-}
-
 project.configureJava9ModuleInfo()
diff --git a/...nx/serialization/features/DurationTest.kt → ...nx/serialization/features/DurationTest.kt b/...nx/serialization/features/DurationTest.kt → ...nx/serialization/features/DurationTest.kt
diff --git a/...on/features/inline/InlineMapQuotedTest.kt → ...on/features/inline/InlineMapQuotedTest.kt b/...on/features/inline/InlineMapQuotedTest.kt → ...on/features/inline/InlineMapQuotedTest.kt
diff --git a/...tion/features/sealed/SealedDiamondTest.kt → ...tion/features/sealed/SealedDiamondTest.kt b/...tion/features/sealed/SealedDiamondTest.kt → ...tion/features/sealed/SealedDiamondTest.kt
diff --git a/.../SealedInterfacesJsonSerializationTest.kt → .../SealedInterfacesJsonSerializationTest.kt b/.../SealedInterfacesJsonSerializationTest.kt → .../SealedInterfacesJsonSerializationTest.kt