Migrate Settings plugin to Jewel

Author: egorikftp

build-logic/convention/src/main/kotlin/io/github/composegears/valkyrie/extension/ModuleDependency.kt

@@ -0,0 +1,11 @@
+package io.github.composegears.valkyrie.extension
+
+import org.gradle.api.artifacts.ModuleDependency
+import org.gradle.kotlin.dsl.exclude
+
+fun ModuleDependency.excludeCompose() {
+    exclude("org.jetbrains.compose")
+    exclude("org.jetbrains.compose.foundation")
+    exclude("org.jetbrains.compose.runtime")
+    exclude("org.jetbrains.compose.ui")
+}

sdk/compose/codeviewer/api/codeviewer.api

@@ -6,10 +6,6 @@ public final class io/github/composegears/valkyrie/sdk/compose/codeviewer/CodeVi
 	public static final fun CodeViewer (Ldev/snipme/highlights/Highlights;Landroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
 }
 
-public final class io/github/composegears/valkyrie/sdk/compose/codeviewer/CommonKt {
-	public static final fun rememberCodeHighlight (Ljava/lang/String;Z[Ldev/snipme/highlights/model/PhraseLocation;Landroidx/compose/runtime/Composer;I)Ldev/snipme/highlights/Highlights;
-}
-
 public final class io/github/composegears/valkyrie/sdk/compose/codeviewer/KotlinCodeViewerKt {
 	public static final fun KotlinCodeViewer (Ljava/lang/String;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
 }

sdk/compose/codeviewer/api/codeviewer.klib.api

@@ -9,4 +9,3 @@
 final fun io.github.composegears.valkyrie.sdk.compose.codeviewer/CodeEditor(dev.snipme.highlights/Highlights, kotlin/Function1<kotlin/String, kotlin/Unit>, androidx.compose.ui/Modifier?, kotlin/Boolean, kotlin/Boolean, kotlin/Boolean, androidx.compose.ui.text/TextStyle?, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>?, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>?, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>?, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>?, kotlin/Boolean, androidx.compose.ui.text.input/VisualTransformation?, androidx.compose.foundation.text/KeyboardOptions?, androidx.compose.foundation.text/KeyboardActions?, kotlin/Boolean, kotlin/Int, kotlin/Int, androidx.compose.foundation.interaction/MutableInteractionSource?, androidx.compose.ui.graphics/Shape?, androidx.compose.material3/TextFieldColors?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int, kotlin/Int, kotlin/Int) // io.github.composegears.valkyrie.sdk.compose.codeviewer/CodeEditor|CodeEditor(dev.snipme.highlights.Highlights;kotlin.Function1<kotlin.String,kotlin.Unit>;androidx.compose.ui.Modifier?;kotlin.Boolean;kotlin.Boolean;kotlin.Boolean;androidx.compose.ui.text.TextStyle?;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>?;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>?;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>?;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>?;kotlin.Boolean;androidx.compose.ui.text.input.VisualTransformation?;androidx.compose.foundation.text.KeyboardOptions?;androidx.compose.foundation.text.KeyboardActions?;kotlin.Boolean;kotlin.Int;kotlin.Int;androidx.compose.foundation.interaction.MutableInteractionSource?;androidx.compose.ui.graphics.Shape?;androidx.compose.material3.TextFieldColors?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int;kotlin.Int;kotlin.Int){}[0]
 final fun io.github.composegears.valkyrie.sdk.compose.codeviewer/CodeViewer(dev.snipme.highlights/Highlights, androidx.compose.ui/Modifier?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // io.github.composegears.valkyrie.sdk.compose.codeviewer/CodeViewer|CodeViewer(dev.snipme.highlights.Highlights;androidx.compose.ui.Modifier?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]
 final fun io.github.composegears.valkyrie.sdk.compose.codeviewer/KotlinCodeViewer(kotlin/String, androidx.compose.ui/Modifier?, kotlin/Function1<kotlin/String, kotlin/Unit>?, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // io.github.composegears.valkyrie.sdk.compose.codeviewer/KotlinCodeViewer|KotlinCodeViewer(kotlin.String;androidx.compose.ui.Modifier?;kotlin.Function1<kotlin.String,kotlin.Unit>?;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]
-final fun io.github.composegears.valkyrie.sdk.compose.codeviewer/rememberCodeHighlight(kotlin/String, kotlin/Boolean, kotlin/Array<out dev.snipme.highlights.model/PhraseLocation>..., androidx.compose.runtime/Composer?, kotlin/Int): dev.snipme.highlights/Highlights // io.github.composegears.valkyrie.sdk.compose.codeviewer/rememberCodeHighlight|rememberCodeHighlight(kotlin.String;kotlin.Boolean;kotlin.Array<out|dev.snipme.highlights.model.PhraseLocation>...;androidx.compose.runtime.Composer?;kotlin.Int){}[0]

sdk/compose/codeviewer/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/compose/codeviewer/CodeViewer.kt

@@ -9,6 +9,7 @@ import dev.snipme.highlights.Highlights
 import dev.snipme.highlights.model.PhraseLocation
 import io.github.composegears.valkyrie.compose.util.isLight
 import io.github.composegears.valkyrie.sdk.compose.highlights.core.buildAnnotatedString
+import io.github.composegears.valkyrie.sdk.compose.highlights.core.rememberCodeHighlight
 
 @Composable
 fun CodeViewer(

sdk/compose/codeviewer/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/compose/codeviewer/Common.kt

@@ -1,5 +1,6 @@
 public final class io/github/composegears/valkyrie/sdk/compose/highlights/core/CommonKt {
 	public static final fun buildAnnotatedString (Ldev/snipme/highlights/Highlights;)Landroidx/compose/ui/text/AnnotatedString;
 	public static final fun getEmphasisLocations (Ljava/lang/String;Ljava/lang/String;)[Ldev/snipme/highlights/model/PhraseLocation;
+	public static final fun rememberCodeHighlight (Ljava/lang/String;Z[Ldev/snipme/highlights/model/PhraseLocation;Landroidx/compose/runtime/Composer;I)Ldev/snipme/highlights/Highlights;
 }
 

sdk/compose/highlights-core/api/highlights-core.api

@@ -8,3 +8,4 @@
 // Library unique name: <valkyrie.sdk.compose:highlights-core>
 final fun (dev.snipme.highlights/Highlights).io.github.composegears.valkyrie.sdk.compose.highlights.core/buildAnnotatedString(): androidx.compose.ui.text/AnnotatedString // io.github.composegears.valkyrie.sdk.compose.highlights.core/buildAnnotatedString|[email protected](){}[0]
 final fun io.github.composegears.valkyrie.sdk.compose.highlights.core/getEmphasisLocations(kotlin/String, kotlin/String): kotlin/Array<dev.snipme.highlights.model/PhraseLocation> // io.github.composegears.valkyrie.sdk.compose.highlights.core/getEmphasisLocations|getEmphasisLocations(kotlin.String;kotlin.String){}[0]
+final fun io.github.composegears.valkyrie.sdk.compose.highlights.core/rememberCodeHighlight(kotlin/String, kotlin/Boolean, kotlin/Array<out dev.snipme.highlights.model/PhraseLocation>..., androidx.compose.runtime/Composer?, kotlin/Int): dev.snipme.highlights/Highlights // io.github.composegears.valkyrie.sdk.compose.highlights.core/rememberCodeHighlight|rememberCodeHighlight(kotlin.String;kotlin.Boolean;kotlin.Array<out|dev.snipme.highlights.model.PhraseLocation>...;androidx.compose.runtime.Composer?;kotlin.Int){}[0]

sdk/compose/highlights-core/api/highlights-core.klib.api

@@ -1,5 +1,7 @@
 package io.github.composegears.valkyrie.sdk.compose.highlights.core
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -9,6 +11,24 @@ import dev.snipme.highlights.Highlights
 import dev.snipme.highlights.model.BoldHighlight
 import dev.snipme.highlights.model.ColorHighlight
 import dev.snipme.highlights.model.PhraseLocation
+import dev.snipme.highlights.model.SyntaxLanguage
+import dev.snipme.highlights.model.SyntaxThemes
+
+@Composable
+fun rememberCodeHighlight(
+    codeBlock: String,
+    isLight: Boolean,
+    vararg emphasisLocation: PhraseLocation,
+): Highlights {
+    return remember(isLight, codeBlock, emphasisLocation) {
+        Highlights.Builder()
+            .code(codeBlock)
+            .language(SyntaxLanguage.KOTLIN)
+            .theme(SyntaxThemes.darcula(darkMode = !isLight))
+            .emphasis(*emphasisLocation)
+            .build()
+    }
+}
 
 fun Highlights.buildAnnotatedString() = buildAnnotatedString {
     append(getCode())

sdk/compose/highlights-core/src/commonMain/kotlin/io/github/composegears/valkyrie/sdk/compose/highlights/core/Common.kt

@@ -1,3 +1,4 @@
+import io.github.composegears.valkyrie.extension.excludeCompose
 import io.github.composegears.valkyrie.task.CheckComposeVersionCompatibility
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.intellij.platform.gradle.extensions.excludeKotlinStdlib
@@ -168,11 +169,3 @@ tasks {
         dependsOn(checkComposeVersionCompatibility)
     }
 }
-
-
-fun ModuleDependency.excludeCompose() {
-    exclude("org.jetbrains.compose")
-    exclude("org.jetbrains.compose.foundation")
-    exclude("org.jetbrains.compose.runtime")
-    exclude("org.jetbrains.compose.ui")
-}