Fix support with latest changes

livefront · Apr 4, 2023 · e414c48 · e414c48
1 parent 9b32edc
commit e414c48
Show file tree

Hide file tree

Showing 6 changed files with 2,013 additions and 30 deletions.
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/.../commonMain/kotlin/com/livefront/sealedenum/compilation/hierarchy/SealedClassHierarchy.kt b/.../commonMain/kotlin/com/livefront/sealedenum/compilation/hierarchy/SealedClassHierarchy.kt
@@ -269,7 +269,7 @@ public class SecondClassHierarchy {
     }
 }
 
-public val secondClassHierarchyZGenerated = """
+public val secondClassHierarchyZGenerated: String = """
 package com.livefront.sealedenum.compilation.hierarchy
 
 import com.livefront.sealedenum.SealedEnum
@@ -359,7 +359,7 @@ public fun SecondClassHierarchy.Z.Companion.valueOf(name: String): SecondClassHi
 
 """.trimIndent()
 
-public val secondClassHierarchyZXGenerated = """
+public val secondClassHierarchyZXGenerated: String = """
 package com.livefront.sealedenum.compilation.hierarchy
 
 import com.livefront.sealedenum.SealedEnum
@@ -437,7 +437,7 @@ public fun SecondClassHierarchy.Z.X.Companion.valueOf(name: String): SecondClass
 
 """.trimIndent()
 
-public val secondClassHierarchyZXUGenerated = """
+public val secondClassHierarchyZXUGenerated: String = """
 package com.livefront.sealedenum.compilation.hierarchy
 
 import com.livefront.sealedenum.SealedEnum
@@ -503,7 +503,7 @@ public fun SecondClassHierarchy.Z.X.U.Companion.valueOf(name: String): SecondCla
 
 """.trimIndent()
 
-public val secondClassHierarchyZXSGenerated = """
+public val secondClassHierarchyZXSGenerated: String = """
 package com.livefront.sealedenum.compilation.hierarchy
 
 import com.livefront.sealedenum.SealedEnum
@@ -569,7 +569,7 @@ public fun SecondClassHierarchy.Z.X.S.Companion.valueOf(name: String): SecondCla
 
 """.trimIndent()
 
-public val secondClassHierarchyZQGenerated = """
+public val secondClassHierarchyZQGenerated: String = """
 package com.livefront.sealedenum.compilation.hierarchy
 
 import com.livefront.sealedenum.SealedEnum

diff --git a/...src/commonMain/kotlin/com/livefront/sealedenum/compilation/location/OutsideSealedClass.kt b/...src/commonMain/kotlin/com/livefront/sealedenum/compilation/location/OutsideSealedClass.kt
@@ -125,7 +125,7 @@ public object BetaThirdObject : BetaOutsideSealedClass()
 
 public object BetaFourthObject : BetaOutsideSealedClass()
 
-public val betaOutsideSealedClassGenerated = """
+public val betaOutsideSealedClassGenerated: String = """
 package com.livefront.sealedenum.compilation.location
 
 import com.livefront.sealedenum.EnumForSealedEnumProvider
@@ -263,7 +263,7 @@ public object GammaThirdObject : GammaOutsideSealedClass()
 
 public object GammaFourthObject : GammaOutsideSealedClass()
 
-public val gammaOutsideSealedClassGenerated = """
+public val gammaOutsideSealedClassGenerated: String = """
 package com.livefront.sealedenum.compilation.location
 
 import com.livefront.sealedenum.EnumForSealedEnumProvider

diff --git a/...onTest/kotlin/com/livefront/sealedenum/compilation/hierarchy/SealedClassHierarchyTests.kt b/...onTest/kotlin/com/livefront/sealedenum/compilation/hierarchy/SealedClassHierarchyTests.kt
@@ -25,7 +25,7 @@ class SealedClassHierarchyTests {
     }
 
     @Test
-    fun `second hierarchy class Z values`() {
+    fun second_hierarchy_class_Z_values() {
         assertEquals(
             listOf(
                 SecondClassHierarchy.Z.Y,
@@ -41,42 +41,42 @@ class SealedClassHierarchyTests {
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_Y`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_Y() {
         assertEquals(0, (SecondClassHierarchy.Z.Y as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_X_W`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_X_W() {
         assertEquals(1, (SecondClassHierarchy.Z.X.W as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_X_V`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_X_V() {
         assertEquals(2, (SecondClassHierarchy.Z.X.V as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_X_U_T`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_X_U_T() {
         assertEquals(3, (SecondClassHierarchy.Z.X.U.T as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_X_S_R`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_X_S_R() {
         assertEquals(4, (SecondClassHierarchy.Z.X.S.R as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_Q_P`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_Q_P() {
         assertEquals(5, (SecondClassHierarchy.Z.Q.P as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Z ordinal of Z_O`() {
+    fun second_hierarchy_class_Z_ordinal_of_Z_O() {
         assertEquals(6, (SecondClassHierarchy.Z.O as SecondClassHierarchy.Z).ordinal)
     }
 
     @Test
-    fun `second hierarchy class X values`() {
+    fun second_hierarchy_class_X_values() {
         assertEquals(
             listOf(
                 SecondClassHierarchy.Z.X.W,
@@ -89,61 +89,61 @@ class SealedClassHierarchyTests {
     }
 
     @Test
-    fun `second hierarchy class X ordinal of Z_X_W`() {
+    fun second_hierarchy_class_X_ordinal_of_Z_X_W() {
         assertEquals(0, (SecondClassHierarchy.Z.X.W as SecondClassHierarchy.Z.X).ordinal)
     }
 
     @Test
-    fun `second hierarchy class X ordinal of Z_X_V`() {
+    fun second_hierarchy_class_X_ordinal_of_Z_X_V() {
         assertEquals(1, (SecondClassHierarchy.Z.X.V as SecondClassHierarchy.Z.X).ordinal)
     }
 
     @Test
-    fun `second hierarchy class X ordinal of Z_X_U_T`() {
+    fun second_hierarchy_class_X_ordinal_of_Z_X_U_T() {
         assertEquals(2, (SecondClassHierarchy.Z.X.U.T as SecondClassHierarchy.Z.X).ordinal)
     }
 
     @Test
-    fun `second hierarchy class X ordinal of Z_X_S_R`() {
+    fun second_hierarchy_class_X_ordinal_of_Z_X_S_R() {
         assertEquals(3, (SecondClassHierarchy.Z.X.S.R as SecondClassHierarchy.Z.X).ordinal)
     }
 
     @Test
-    fun `second hierarchy class U values`() {
+    fun second_hierarchy_class_U_values() {
         assertEquals(
             listOf(SecondClassHierarchy.Z.X.U.T),
             SecondClassHierarchy.Z.X.U.values
         )
     }
 
     @Test
-    fun `second hierarchy class U ordinal of Z_X_U_T`() {
+    fun second_hierarchy_class_U_ordinal_of_Z_X_U_T() {
         assertEquals(0, (SecondClassHierarchy.Z.X.U.T as SecondClassHierarchy.Z.X.U).ordinal)
     }
 
     @Test
-    fun `second hierarchy class S values`() {
+    fun second_hierarchy_class_S_values() {
         assertEquals(
             listOf(SecondClassHierarchy.Z.X.S.R),
             SecondClassHierarchy.Z.X.S.values
         )
     }
 
     @Test
-    fun `second hierarchy class S ordinal of Z_X_S_R`() {
+    fun second_hierarchy_class_S_ordinal_of_Z_X_S_R() {
         assertEquals(0, (SecondClassHierarchy.Z.X.S.R as SecondClassHierarchy.Z.X.S).ordinal)
     }
 
     @Test
-    fun `second hierarchy class Q values`() {
+    fun second_hierarchy_class_Q_values() {
         assertEquals(
             listOf(SecondClassHierarchy.Z.Q.P),
             SecondClassHierarchy.Z.Q.values
         )
     }
 
     @Test
-    fun `second hierarchy class Q ordinal of Z_Q_P`() {
+    fun second_hierarchy_class_Q_ordinal_of_Z_Q_P() {
         assertEquals(0, (SecondClassHierarchy.Z.Q.P as SecondClassHierarchy.Z.Q).ordinal)
     }
 }
diff --git a/processing-tests/ksp-common-tests/build.gradle.kts b/processing-tests/ksp-common-tests/build.gradle.kts
@@ -28,12 +28,12 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(projects.runtime)
-                project.dependencies.add("kspMetadata", projects.ksp)
+                project.dependencies.add("kspCommonMainMetadata", projects.ksp)
             }
             if (!disableForSharedCode) {
                 kotlin.srcDir("$rootDir/processing-tests/common/src/commonMain")
             }
-            kotlin.srcDir("$buildDir/generated/ksp/commonMain/kotlin")
+            kotlin.srcDir("$buildDir/generated/ksp/metadata/commonMain/kotlin")
         }
 
         val commonTest by getting {
@@ -50,8 +50,8 @@ kotlin {
 
 tasks {
     withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>>().all {
-        if (name != "kspKotlinMetadata") {
-            dependsOn("kspKotlinMetadata")
+        if (name != "kspCommonMainKotlinMetadata") {
+            dependsOn("kspCommonMainKotlinMetadata")
         }
     }
 }

diff --git a/...c/commonMain/kotlin/com/livefront/sealedenum/compilation/ksp/NestedObjectsWithSameName.kt b/...c/commonMain/kotlin/com/livefront/sealedenum/compilation/ksp/NestedObjectsWithSameName.kt
@@ -12,6 +12,7 @@ public class NestedObjectsWithSameName {
     }
 }
 
+@Suppress("MaxLineLength")
 public val nestedObjectsWithSameNameEmptySealedClassGenerated: String = """
 package com.livefront.sealedenum.compilation.ksp