diff --git a/build.gradle b/build.gradle index abe3c3d..de32adf 100644 --- a/build.gradle +++ b/build.gradle @@ -7,15 +7,15 @@ buildscript { } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" + classpath libs.buildscript.kt.gradle + classpath libs.buildscript.kt.serialization + classpath libs.buildscript.jb.dokka } } plugins { - id 'org.jetbrains.kotlin.js' version "$kotlin_version" - id "org.jetbrains.compose" version "$jetbrains_compose_version" + alias(libs.plugins.kt.js) + alias(libs.plugins.jb.compose) } project.version = "$version" @@ -38,12 +38,12 @@ kotlin { dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version" - implementation(compose.web.core) - implementation(compose.runtime) - implementation "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version" - implementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" + implementation libs.kt.stdlib + api libs.kt.serialization + implementation compose.web.core + implementation compose.runtime + testImplementation libs.kt.test.js + testImplementation libs.kt.test.junit } apply from: "./github_release.gradle" diff --git a/gradle.properties b/gradle.properties index 8034368..9c2011f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,16 +6,6 @@ kotlin.incremental.js=true android.useAndroidX=true android.enableJetifier=true -kotlin_version=1.5.31 -kotlin_serialisation_core_version=1.3.1 -jetbrains_compose_version=1.0.0 - -github_release_plugin_version=2.2.12 - -# Dokka - -dokka_version=1.5.30 - # Project data group=dev.inmo diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..ba7e1da --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,23 @@ +[versions] + +kt = "1.6.10" +kt-serialization = "1.3.2" +jb-compose = "1.0.1" +jb-dokka = "1.6.10" +gh-release = "2.2.12" + +[libraries] + +kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" } +kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" } +kt-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kt" } +kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" } + +buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" } +buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" } +buildscript-jb-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "jb-dokka" } + +[plugins] + +kt-js = { id = "org.jetbrains.kotlin.js", version.ref = "kt" } +jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d2880ba..2e6e589 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 71e1e97..0d6170a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ rootProject.name = 'jsuikitkotlin' +enableFeaturePreview("VERSION_CATALOGS")