Move :parser:core into sdk

egorikftp · egorikftp · commit bf4c2fc8ac12 · 2026-03-06T20:10:17.000+03:00
diff --git a/components/parser/common/api/common.klib.api b/components/parser/common/api/common.klib.api
diff --git a/components/parser/jvm/xml/build.gradle.kts b/components/parser/jvm/xml/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.components.parser.common)
     implementation(projects.sdk.ir.core)
+    implementation(projects.sdk.parser.common)
     implementation(libs.xpp3) {
         exclude(group = "junit", module = "junit")
     }
diff --git a/components/parser/jvm/xml/src/main/kotlin/io/github/composegears/valkyrie/parser/jvm/xml/ext/Ir.kt b/components/parser/jvm/xml/src/main/kotlin/io/github/composegears/valkyrie/parser/jvm/xml/ext/Ir.kt
@@ -1,12 +1,12 @@
 package io.github.composegears.valkyrie.parser.jvm.xml.ext
 
-import io.github.composegears.valkyrie.parser.common.AndroidColorParser
-import io.github.composegears.valkyrie.parser.common.PathParser
 import io.github.composegears.valkyrie.sdk.ir.core.IrColor
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathFillType
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
 import io.github.composegears.valkyrie.sdk.ir.core.IrStrokeLineCap
 import io.github.composegears.valkyrie.sdk.ir.core.IrStrokeLineJoin
+import io.github.composegears.valkyrie.sdk.parser.common.AndroidColorParser
+import io.github.composegears.valkyrie.sdk.parser.common.PathParser
 import org.xmlpull.v1.XmlPullParser
 
 internal fun XmlPullParser.valueAsPathData(): List<IrPathNode> {
diff --git a/components/parser/kmp/svg/build.gradle.kts b/components/parser/kmp/svg/build.gradle.kts
@@ -8,7 +8,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(projects.sdk.ir.core)
-            implementation(projects.components.parser.common)
+            implementation(projects.sdk.parser.common)
             implementation(libs.xmlutil)
         }
         commonTest.dependencies {
diff --git a/components/parser/kmp/svg/src/commonMain/kotlin/io/github/composegears/valkyrie/parser/kmp/svg/SVGParser.kt b/components/parser/kmp/svg/src/commonMain/kotlin/io/github/composegears/valkyrie/parser/kmp/svg/SVGParser.kt
@@ -1,13 +1,13 @@
 package io.github.composegears.valkyrie.parser.kmp.svg
 
-import io.github.composegears.valkyrie.parser.common.PathParser
 import io.github.composegears.valkyrie.sdk.ir.core.IrColor
 import io.github.composegears.valkyrie.sdk.ir.core.IrFill
 import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathFillType
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
 import io.github.composegears.valkyrie.sdk.ir.core.IrStroke
 import io.github.composegears.valkyrie.sdk.ir.core.IrVectorNode
+import io.github.composegears.valkyrie.sdk.parser.common.PathParser
 
 private typealias ViewBox = List<Float>
 
diff --git a/components/parser/kmp/xml/build.gradle.kts b/components/parser/kmp/xml/build.gradle.kts
@@ -10,7 +10,7 @@ kotlin {
         commonMain.dependencies {
             implementation(projects.sdk.core.xml)
             implementation(projects.sdk.ir.core)
-            implementation(projects.components.parser.common)
+            implementation(projects.sdk.parser.common)
             implementation(libs.xmlutil)
         }
         commonTest {
diff --git a/components/parser/kmp/xml/src/commonMain/kotlin/io/github/composegears/valkyrie/parser/kmp/xml/XmlToImageVectorParser.kt b/components/parser/kmp/xml/src/commonMain/kotlin/io/github/composegears/valkyrie/parser/kmp/xml/XmlToImageVectorParser.kt
@@ -1,7 +1,5 @@
 package io.github.composegears.valkyrie.parser.kmp.xml
 
-import io.github.composegears.valkyrie.parser.common.AndroidColorParser
-import io.github.composegears.valkyrie.parser.common.PathParser
 import io.github.composegears.valkyrie.sdk.core.xml.VectorDrawable
 import io.github.composegears.valkyrie.sdk.ir.core.IrColor
 import io.github.composegears.valkyrie.sdk.ir.core.IrFill
@@ -11,6 +9,8 @@ import io.github.composegears.valkyrie.sdk.ir.core.IrStroke
 import io.github.composegears.valkyrie.sdk.ir.core.IrStrokeLineCap
 import io.github.composegears.valkyrie.sdk.ir.core.IrStrokeLineJoin
 import io.github.composegears.valkyrie.sdk.ir.core.IrVectorNode
+import io.github.composegears.valkyrie.sdk.parser.common.AndroidColorParser
+import io.github.composegears.valkyrie.sdk.parser.common.PathParser
 
 object XmlToImageVectorParser {
     fun parse(text: String): IrImageVector {
diff --git a/sdk/intellij/psi/imagevector/build.gradle.kts b/sdk/intellij/psi/imagevector/build.gradle.kts
@@ -36,9 +36,9 @@ configurations {
 }
 
 dependencies {
-    implementation(projects.sdk.ir.core)
     implementation(projects.sdk.core.extensions)
-    implementation(projects.components.parser.common)
+    implementation(projects.sdk.ir.core)
+    implementation(projects.sdk.parser.common)
 
     compileOnly(compose.runtime)
 
diff --git a/sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/common/KtCallExpression.kt b/sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/common/KtCallExpression.kt
@@ -1,6 +1,5 @@
 package io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.common
 
-import io.github.composegears.valkyrie.parser.common.PathParser
 import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
 import io.github.composegears.valkyrie.sdk.ir.core.IrColor
 import io.github.composegears.valkyrie.sdk.ir.core.IrFill
@@ -9,6 +8,7 @@ import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
 import io.github.composegears.valkyrie.sdk.ir.core.IrStroke
 import io.github.composegears.valkyrie.sdk.ir.core.IrStrokeLineCap
 import io.github.composegears.valkyrie.sdk.ir.core.IrStrokeLineJoin
+import io.github.composegears.valkyrie.sdk.parser.common.PathParser
 import org.jetbrains.kotlin.psi.KtCallExpression
 
 internal fun KtCallExpression.extractPathFillType(): IrPathFillType {
diff --git a/sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/common/PathNodeParser.kt b/sdk/intellij/psi/imagevector/src/main/kotlin/io/github/composegears/valkyrie/sdk/intellij/psi/imagevector/common/PathNodeParser.kt
@@ -1,6 +1,5 @@
 package io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.common
 
-import io.github.composegears.valkyrie.parser.common.PathParser
 import io.github.composegears.valkyrie.sdk.intellij.psi.imagevector.util.childrenOfType
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.ArcTo
@@ -22,6 +21,7 @@ import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeReflective
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeReflectiveQuadTo
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeVerticalTo
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.VerticalTo
+import io.github.composegears.valkyrie.sdk.parser.common.PathParser
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtCallExpression
 
diff --git a/sdk/parser/common/api/common.api b/sdk/parser/common/api/common.api
@@ -1,11 +1,11 @@
-public final class io/github/composegears/valkyrie/parser/common/AndroidColorParser {
-	public static final field INSTANCE Lio/github/composegears/valkyrie/parser/common/AndroidColorParser;
+public final class io/github/composegears/valkyrie/sdk/parser/common/AndroidColorParser {
+	public static final field INSTANCE Lio/github/composegears/valkyrie/sdk/parser/common/AndroidColorParser;
 	public final fun getAndroidColorsMap ()Ljava/util/Map;
 	public final fun parse-AzGxbLk (Ljava/lang/String;)Lio/github/composegears/valkyrie/sdk/ir/core/IrColor;
 }
 
-public final class io/github/composegears/valkyrie/parser/common/PathParser {
-	public static final field INSTANCE Lio/github/composegears/valkyrie/parser/common/PathParser;
+public final class io/github/composegears/valkyrie/sdk/parser/common/PathParser {
+	public static final field INSTANCE Lio/github/composegears/valkyrie/sdk/parser/common/PathParser;
 	public final fun parsePathString (Ljava/lang/String;)Ljava/util/List;
 }
 
diff --git a/sdk/parser/common/api/common.klib.api b/sdk/parser/common/api/common.klib.api
@@ -0,0 +1,18 @@
+// Klib ABI Dump
+// Targets: [wasmJs]
+// Rendering settings:
+// - Signature version: 2
+// - Show manifest properties: true
+// - Show declarations: true
+
+// Library unique name: <valkyrie.sdk.parser:common>
+final object io.github.composegears.valkyrie.sdk.parser.common/AndroidColorParser { // io.github.composegears.valkyrie.sdk.parser.common/AndroidColorParser|null[0]
+    final val androidColorsMap // io.github.composegears.valkyrie.sdk.parser.common/AndroidColorParser.androidColorsMap|{}androidColorsMap[0]
+        final fun <get-androidColorsMap>(): kotlin.collections/Map<kotlin/String, kotlin/String> // io.github.composegears.valkyrie.sdk.parser.common/AndroidColorParser.androidColorsMap.<get-androidColorsMap>|<get-androidColorsMap>(){}[0]
+
+    final fun parse(kotlin/String): io.github.composegears.valkyrie.sdk.ir.core/IrColor? // io.github.composegears.valkyrie.sdk.parser.common/AndroidColorParser.parse|parse(kotlin.String){}[0]
+}
+
+final object io.github.composegears.valkyrie.sdk.parser.common/PathParser { // io.github.composegears.valkyrie.sdk.parser.common/PathParser|null[0]
+    final fun parsePathString(kotlin/String): kotlin.collections/List<io.github.composegears.valkyrie.sdk.ir.core/IrPathNode> // io.github.composegears.valkyrie.sdk.parser.common/PathParser.parsePathString|parsePathString(kotlin.String){}[0]
+}
diff --git a/sdk/parser/common/build.gradle.kts b/sdk/parser/common/build.gradle.kts
diff --git a/sdk/parser/common/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/parser/common/AndroidColorParser.kt b/sdk/parser/common/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/parser/common/AndroidColorParser.kt
@@ -1,4 +1,4 @@
-package io.github.composegears.valkyrie.parser.common
+package io.github.composegears.valkyrie.sdk.parser.common
 
 import io.github.composegears.valkyrie.sdk.ir.core.IrColor
 
diff --git a/sdk/parser/common/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/parser/common/PathNode.kt b/sdk/parser/common/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/parser/common/PathNode.kt
@@ -1,4 +1,4 @@
-package io.github.composegears.valkyrie.parser.common
+package io.github.composegears.valkyrie.sdk.parser.common
 
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.ArcTo
diff --git a/sdk/parser/common/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/parser/common/PathParser.kt b/sdk/parser/common/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/parser/common/PathParser.kt
@@ -1,4 +1,4 @@
-package io.github.composegears.valkyrie.parser.common
+package io.github.composegears.valkyrie.sdk.parser.common
 
 import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
 import kotlin.math.min
diff --git a/sdk/parser/common/src/commonTest/kotlin/io/github/composegears/valkyrie/sdk/parser/common/AndroidColorParserTest.kt b/sdk/parser/common/src/commonTest/kotlin/io/github/composegears/valkyrie/sdk/parser/common/AndroidColorParserTest.kt
@@ -1,4 +1,4 @@
-package io.github.composegears.valkyrie.parser.common
+package io.github.composegears.valkyrie.sdk.parser.common
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
diff --git a/sdk/test/coverage/build.gradle.kts b/sdk/test/coverage/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     kover(projects.components.generator.jvm.poetExtensions)
     kover(projects.components.generator.iconpack)
     kover(projects.components.generator.jvm.imagevector)
-    kover(projects.components.parser.common)
     kover(projects.components.parser.jvm.svg)
     kover(projects.components.parser.jvm.xml)
     kover(projects.components.parser.kmp.xml)
@@ -20,4 +19,5 @@ dependencies {
     kover(projects.sdk.ir.core)
     kover(projects.sdk.ir.util)
     kover(projects.sdk.ir.xml)
+    kover(projects.sdk.parser.common)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -75,7 +75,6 @@ include("components:generator:kmp:imagevector")
 include("components:generator:iconpack")
 include("components:generator:jvm:poet-extensions")
 include("components:generator:jvm:imagevector")
-include("components:parser:common")
 include("components:parser:jvm:svg")
 include("components:parser:jvm:xml")
 include("components:parser:kmp:xml")
@@ -97,6 +96,7 @@ include("sdk:ir:compose")
 include("sdk:ir:core")
 include("sdk:ir:util")
 include("sdk:ir:xml")
+include("sdk:parser:common")
 include("sdk:shared")
 include("sdk:test:coverage")
 include("sdk:test:resource-loader")

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- implementation(projects.components.parser.common)`
`9`	`8`	`implementation(projects.sdk.ir.core)`
	`9`	`+ implementation(projects.sdk.parser.common)`
`10`	`10`	`implementation(libs.xpp3) {`
`11`	`11`	`exclude(group = "junit", module = "junit")`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ kotlin {`
`8`	`8`	`sourceSets {`
`9`	`9`	`commonMain.dependencies {`
`10`	`10`	`implementation(projects.sdk.ir.core)`
`11`		`- implementation(projects.components.parser.common)`
	`11`	`+ implementation(projects.sdk.parser.common)`
`12`	`12`	`implementation(libs.xmlutil)`
`13`	`13`	`}`
`14`	`14`	`commonTest.dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ kotlin {`
`10`	`10`	`commonMain.dependencies {`
`11`	`11`	`implementation(projects.sdk.core.xml)`
`12`	`12`	`implementation(projects.sdk.ir.core)`
`13`		`- implementation(projects.components.parser.common)`
	`13`	`+ implementation(projects.sdk.parser.common)`
`14`	`14`	`implementation(libs.xmlutil)`
`15`	`15`	`}`
`16`	`16`	`commonTest {`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ configurations {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`dependencies {`
`39`		`- implementation(projects.sdk.ir.core)`
`40`	`39`	`implementation(projects.sdk.core.extensions)`
`41`		`- implementation(projects.components.parser.common)`
	`40`	`+ implementation(projects.sdk.ir.core)`
	`41`	`+ implementation(projects.sdk.parser.common)`
`42`	`42`
`43`	`43`	`compileOnly(compose.runtime)`
`44`	`44`