Merge pull request #60 from kaleidot725/feat/migrate_toml_file

feat: migrate toml file

build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
-    kotlin("multiplatform")
-    id("org.jetbrains.compose")
-    kotlin("plugin.serialization")
-    id("org.jlleitschuh.gradle.ktlint")
+    alias(libs.plugins.multiplatform)
+    alias(libs.plugins.compose)
+    alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.ktlint)
 }
 
 group = "jp.kaleidot725"

gradle.properties

@@ -1,13 +1,2 @@
 kotlin.code.style=official
-kotlin.mpp.stability.nowarn=true
-kotlin.version=1.7.10
-kotlin.coroutines=1.6.4
-kotlin.serialization=1.3.3
-compose.version=1.2.1
-library.ktlint.plugin=10.3.0
-library.adam=0.4.5
-library.junit=5.9.0
-library.koin=3.2.2
-library.system_theme_detector=3.8
-library.conveyor=1.3
-library.jetbrains_expui_theme=2.1.0
+kotlin.mpp.stability.nowarn=true

gradle/libs.versions.toml

@@ -0,0 +1,26 @@
+[versions]
+kotlin="1.7.10"
+kotlin_coroutines="1.6.4"
+kotlin_serialization="1.3.3"
+compose="1.2.1"
+ktlint_plugin="10.3.0"
+adam="0.4.5"
+junit="5.9.0"
+koin="3.2.2"
+system_theme_detector="3.8"
+jetbrains_expui_theme="2.1.0"
+
+[libraries]
+adam = { module = "com.malinskiy.adam:adam", version.ref = "adam" }
+kotlin_coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin_coroutines" }
+kotlin_serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin_serialization" }
+junit5 = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
+jSystemThemeDetectorVer = { module = "com.github.Dansoftowner:jSystemThemeDetector", version.ref = "system_theme_detector" }
+jetbrainsExpUiTheme = { module = "com.bybutter.compose:compose-jetbrains-expui-theme", version.ref = "jetbrains_expui_theme" }
+
+[plugins]
+multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint_plugin" }

settings.gradle.kts

@@ -6,12 +6,6 @@ pluginManagement {
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         maven("https://maven.hq.hydraulic.software")
     }
-    plugins {
-        kotlin("multiplatform").version(extra["kotlin.version"] as String)
-        kotlin("plugin.serialization").version(extra["kotlin.version"] as String)
-        id("org.jetbrains.compose").version(extra["compose.version"] as String)
-        id("org.jlleitschuh.gradle.ktlint").version(extra["library.ktlint.plugin"] as String)
-    }
 }
 
 dependencyResolutionManagement {
@@ -21,24 +15,6 @@ dependencyResolutionManagement {
         gradlePluginPortal()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
-    versionCatalogs {
-        create("libs") {
-            val adamVer = extra["library.adam"] as String
-            library("adam", "com.malinskiy.adam:adam:$adamVer")
-            val coroutinesVer = extra["kotlin.coroutines"] as String
-            library("kotlin-coroutines", "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVer")
-            val serializationVer = extra["kotlin.serialization"] as String
-            library("kotlin-serialization", "org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVer")
-            val junitVer = extra["library.junit"] as String
-            library("junit5", "org.junit.jupiter:junit-jupiter:$junitVer")
-            val koin = extra["library.koin"] as String
-            library("koin", "io.insert-koin:koin-core:$koin")
-            val jSystemThemeDetectorVer = extra["library.system_theme_detector"] as String
-            library("jSystemThemeDetectorVer", "com.github.Dansoftowner:jSystemThemeDetector:$jSystemThemeDetectorVer")
-            val jetbrainsExpUiThemeVer = extra["library.jetbrains_expui_theme"] as String
-            library("jetbrainsExpUiTheme", "com.bybutter.compose:compose-jetbrains-expui-theme:$jetbrainsExpUiThemeVer")
-        }
-    }
 }
 
 rootProject.name = "adbpad"