use version catalog, bump dependency versions, and really bump to 0.6…

….0-p2.
atsushieno · Aug 2, 2023 · 3e98459 · 3e98459
1 parent 283b574
commit 3e98459
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 108 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "1.7.20" apply false
-    id "org.jetbrains.kotlin.jvm" version "1.7.20" apply false
+    id "org.jetbrains.kotlin.multiplatform" version "1.8.20" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.8.20" apply false
     id "com.android.library" version "7.4.2" apply false
-    id "org.jetbrains.dokka" version "1.7.20" apply false
+    id "org.jetbrains.dokka" version "1.8.20" apply false
 }
 
 allprojects {
     group = 'dev.atsushieno'
-    version = '0.6.0-preview1'
+    version = '0.6.0-preview2'
 
     repositories {
         google()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,31 @@
+[versions]
+alsakt = "0.1.4.3"
+core-ktx = "1.10.1"
+jna = "5.12.1"
+jnaerator-runtime = "0.12"
+junit = "4.13.2"
+kotlin-test-junit = "1.9.0"
+kotlinx-coroutines-core = "1.7.0"
+kotlinx-datetime = "0.4.0"
+ktor-io = "2.3.0"
+metalava-gradle = "0.2.3"
+rtmidi-jna = "0.1.3"
+
+[libraries]
+alsakt = { module = "dev.atsushieno:alsakt", version.ref = "alsakt" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
+jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+jnaerator-runtime = { module = "com.nativelibs4java:jnaerator-runtime", version.ref = "jnaerator-runtime" }
+junit = { module = "junit:junit", version.ref = "junit" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin-test-junit" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines-core" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
+ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor-io" }
+metalava-gradle = { module = "me.tylerbwong.gradle:metalava-gradle", version.ref = "metalava-gradle" }
+rtmidi-jna = { module = "dev.atsushieno:rtmidi-jna", version.ref = "rtmidi-jna" }
+
+[plugins]
+
+[bundles]
+
diff --git a/ktmidi-jvm-desktop/build.gradle b/ktmidi-jvm-desktop/build.gradle
@@ -6,15 +6,15 @@ plugins {
 
 dependencies {
     implementation project(":ktmidi")
-    implementation 'dev.atsushieno:alsakt:0.1.4.3'
-    implementation "dev.atsushieno:rtmidi-jna:0.1.3"
-    implementation 'net.java.dev.jna:jna:5.12.1'
-    implementation 'com.nativelibs4java:jnaerator-runtime:0.12'
+    implementation libs.alsakt
+    implementation libs.rtmidi.jna
+    implementation libs.jna
+    implementation libs.jnaerator.runtime
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.4.0'
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.7.10'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    implementation libs.kotlinx.coroutines.core
+    implementation libs.kotlinx.datetime
+    testImplementation libs.kotlin.test.junit
+    testImplementation libs.kotlinx.coroutines.test
 }
 
 java {

diff --git a/ktmidi-native-ext/build.gradle.kts b/ktmidi-native-ext/build.gradle.kts
@@ -32,17 +32,17 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("io.ktor:ktor-io:2.1.0")
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.ktor.io)
                 implementation(project(":ktmidi"))
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.coroutines.test)
             }
         }
         val nativeMain by getting

diff --git a/ktmidi/api/ktmidi-api.txt b/ktmidi/api/ktmidi-api.txt
diff --git a/ktmidi/build.gradle.kts b/ktmidi/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
         maven("https://plugins.gradle.org/m2/")
     }
     dependencies {
-        classpath("me.tylerbwong.gradle:metalava-gradle:0.2.3")
+        classpath(libs.metalava.gradle)
     }
 }
 
@@ -15,7 +15,7 @@ plugins {
     id("org.jetbrains.dokka")
     id("maven-publish")
     id("signing")
-    id("me.tylerbwong.gradle.metalava") version "0.2.3"
+    id("me.tylerbwong.gradle.metalava") version "0.3.3"
 }
 
 kotlin {
@@ -36,7 +36,7 @@ kotlin {
             testTask {
                 useKarma {
                     useChromeHeadless()
-                    webpackConfig.cssSupport.enabled = true
+                    webpackConfig.cssSupport {}
                 }
             }
         }
@@ -58,29 +58,29 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                implementation("io.ktor:ktor-io:2.1.0")
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.ktor.io)
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.coroutines.test)
             }
         }
         val jvmMain by getting
         val androidMain by getting {
             dependencies {
-                implementation("androidx.core:core-ktx:1.9.0")
+                implementation(libs.core.ktx)
             }
         }
         val androidTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.13.2")
+                implementation(libs.junit)
             }
         }
         val jvmTest by getting {

diff --git a/player-sample-lib/build.gradle.kts b/player-sample-lib/build.gradle.kts
@@ -47,18 +47,18 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-                implementation("io.ktor:ktor-io:2.1.0")
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.ktor.io)
                 implementation(project(":ktmidi"))
             }
         }
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.coroutines.test)
             }
         }
         val jvmMain by getting {

diff --git a/player-sample-native/build.gradle.kts b/player-sample-native/build.gradle.kts
@@ -26,7 +26,7 @@ kotlin {
     sourceSets {
         val nativeMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+                implementation(libs.kotlinx.coroutines.core)
                 implementation(project(":ktmidi"))
                 implementation(project(":player-sample-lib"))
             }

diff --git a/player-sample/build.gradle b/player-sample/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation libs.kotlinx.coroutines.core
     implementation project(":ktmidi")
     implementation project(":ktmidi-jvm-desktop")
     implementation project(":player-sample-lib")