NeoUtils · Irineu333 · May 16, 2025 · May 16, 2025 · May 17, 2025
diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -60,7 +60,7 @@ kotlin {
             implementation(catalog.voyager.koin)
 
             // lifecycle
-            implementation(catalog.androidx.multplatform.lifecycle.runtime.compose)
+            implementation(catalog.jetbrains.androidx.lifecycle.runtime.compose)
 
             // compose
             implementation(compose.runtime)
@@ -69,6 +69,7 @@ kotlin {
             implementation(compose.material3)
             implementation(compose.materialIconsExtended)
             implementation(compose.components.resources)
+            implementation(compose.components.uiToolingPreview)
 
             // koin
             implementation(libs.koin.core)
@@ -77,12 +78,19 @@ kotlin {
 
         androidMain.dependencies {
 
+            // compose
+            implementation(compose.preview)
+
             // koin
             implementation(libs.koin.android)
         }
     }
 }
 
+dependencies {
+    debugImplementation(compose.uiTooling)
+}
+
 tasks.register<Tar>("packageReleaseTarGz") {
 
     group = "distribution"
@@ -108,3 +116,4 @@ tasks.register<Tar>("packageReleaseTarGz") {
 aboutLibraries {
     prettyPrint = true
 }
+
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.android-app.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.android-app.gradle.kts
@@ -16,13 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
 @file:Suppress("UnstableApiUsage")
 
 import extension.*
-import gradle.kotlin.dsl.accessors._3c98c44ac979be75a1ef93311f530471.kotlin
-import gradle.kotlin.dsl.accessors._9d6accdeac6876c73060866945fb6d8c.sourceSets
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -56,13 +52,13 @@ kotlin {
 
 android {
     namespace = config.basePackage
-    compileSdk = config.android.compileSdk
+    compileSdk = catalog.versions.android.compileSdk.get().toInt()
 
     defaultConfig {
         applicationId = "com.neo.regex" // Legacy package
 
-        minSdk = config.android.minSdk
-        targetSdk = config.android.targetSdk
+        minSdk = catalog.versions.android.minSdk.get().toInt()
+        targetSdk = catalog.versions.android.targetSdk.get().toInt()
 
         versionCode = config.version.code()
         versionName = config.version.name()

diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.android-library.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.android-library.gradle.kts
@@ -18,8 +18,9 @@
 
 @file:Suppress("UnstableApiUsage")
 
+import extension.catalog
 import extension.config
-import gradle.kotlin.dsl.accessors._3c98c44ac979be75a1ef93311f530471.kotlin
+import gradle.kotlin.dsl.accessors._99f383e9504ff70e774f7d99a658657b.kotlin
 
 plugins {
     id("com.android.library")
@@ -33,12 +34,11 @@ kotlin {
 }
 
 android {
-
     namespace = config.basePackage
-    compileSdk = config.android.compileSdk
+    compileSdk = catalog.versions.android.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = config.android.minSdk
+        minSdk = catalog.versions.android.minSdk.get().toInt()
     }
 
     buildFeatures {

diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.core.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.core.gradle.kts
@@ -16,14 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
 @file:Suppress("UnstableApiUsage")
 
 import extension.catalog
 import extension.config
-import extension.module
 import extension.name
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -48,9 +45,9 @@ kotlin {
         }
     }
 
-    jvm("desktop")
+    jvm(name = "desktop")
 
-    js("web", IR) {
+    js(name = "web", compiler = IR) {
         browser()
         binaries.library()
     }
@@ -59,7 +56,7 @@ kotlin {
         commonMain.dependencies {
 
             // lifecycle
-            implementation(catalog.androidx.multplatform.lifecycle.runtime.compose)
+            implementation(catalog.jetbrains.androidx.lifecycle.runtime.compose)
 
             // compose
             implementation(compose.runtime)
@@ -68,6 +65,7 @@ kotlin {
             implementation(compose.material3)
             implementation(compose.materialIconsExtended)
             implementation(compose.components.resources)
+            implementation(compose.components.uiToolingPreview)
 
             // koin
             implementation(catalog.koin.core)
@@ -77,6 +75,12 @@ kotlin {
             implementation(catalog.kotlinx.datetime)
         }
 
+        androidMain.dependencies {
+
+            // compose
+            implementation(compose.preview)
+        }
+
         val desktopMain by getting {
             dependencies {
                 // compose
@@ -85,3 +89,7 @@ kotlin {
         }
     }
 }
+
+dependencies {
+    debugImplementation(compose.uiTooling)
+}
diff --git a/build-logic/src/main/kotlin/com.neoutils.neoregex.web-app.gradle.kts b/build-logic/src/main/kotlin/com.neoutils.neoregex.web-app.gradle.kts
@@ -29,9 +29,9 @@ kotlin {
         vendor.set(JvmVendorSpec.JETBRAINS)
     }
 
-    js(name = "web", IR) {
+    js(name = "web", compiler = IR) {
 
-        moduleName = "app"
+        outputModuleName = "app"
 
         browser {
             commonWebpackConfig {

diff --git a/build-logic/src/main/kotlin/extension/Project.kt b/build-logic/src/main/kotlin/extension/Project.kt
@@ -30,11 +30,6 @@ val config = Config(
         patch = 0,
         stage = Config.Stage.DEVELOP
     ),
-    android = Config.Android(
-        compileSdk = 34,
-        minSdk = 24,
-        targetSdk = 34
-    ),
     basePackage = "com.neoutils.neoregex",
     name = "NeoRegex"
 )

diff --git a/build-logic/src/main/kotlin/model/Config.kt b/build-logic/src/main/kotlin/model/Config.kt
@@ -21,7 +21,6 @@ package model
 data class Config(
     val name: String,
     val version: Version,
-    val android: Android,
     val basePackage: String
 ) {
     data class Version(
@@ -31,12 +30,6 @@ data class Config(
         val stage: Stage
     )
 
-    data class Android(
-        val compileSdk: Int,
-        val minSdk: Int,
-        val targetSdk: Int
-    )
-
     enum class Stage(val suffix: String?) {
         DEVELOP(suffix = "dev"),
         ALPHA(suffix = "alpha"),

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,8 +21,8 @@ plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kmp.compose.compiler) apply false
-    alias(libs.plugins.kmp.compose) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.compose.multiplatform) apply false
     alias(libs.plugins.buildkonfig) apply false
     alias(libs.plugins.aboutlibraries) apply false
 }
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -32,7 +32,7 @@ kotlin {
         commonMain.dependencies {
 
             // NeoUtils
-            implementation(libs.highlight.compose)
+            implementation(libs.neoutils.highlight.compose)
         }
 
         webTest.dependencies {

diff --git a/core/shared-ui/build.gradle.kts b/core/shared-ui/build.gradle.kts
@@ -37,7 +37,7 @@ kotlin {
             implementation(projects.core.manager)
 
             // NeoUtils
-            implementation(libs.highlight.compose)
+            implementation(libs.neoutils.highlight.compose)
         }
     }
 }

diff --git a/feature/matcher/build.gradle.kts b/feature/matcher/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
             implementation(catalog.voyager.koin)
 
             // NeoUtils
-            implementation(libs.highlight.compose)
+            implementation(libs.neoutils.highlight.compose)
         }
     }
 }
diff --git a/feature/saved/build.gradle.kts b/feature/saved/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
             implementation(catalog.voyager.koin)
 
             // NeoUtils
-            implementation(libs.highlight.compose)
+            implementation(libs.neoutils.highlight.compose)
         }
     }
 }
diff --git a/feature/validator/build.gradle.kts b/feature/validator/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
             implementation(catalog.voyager.koin)
 
             // NeoUtils
-            implementation(libs.highlight.compose)
+            implementation(libs.neoutils.highlight.compose)
         }
     }
 }