Ndoglio/version catalog

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v1.4.4
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Cache build deps

.github/workflows/pull.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v1.4.4
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Cache build deps

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v1.4.4
         with:
-          java-version: 11
+          java-version: 17
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Cache build deps
@@ -71,7 +71,7 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v1.4.4
         with:
-          java-version: 11
+          java-version: 17
       - name: Cache build deps
         uses: actions/cache@v2
         with:

build.gradle.kts

@@ -1,4 +1,3 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
@@ -10,17 +9,12 @@ allprojects {
     }
 }
 
-buildscript {
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
-    }
-}
 
 plugins {
-    id("org.jetbrains.kotlin.multiplatform")
+    alias(libs.plugins.kotlin.multiplatform)
     `maven-publish`
-    id("org.jetbrains.kotlin.plugin.serialization")
-    id("com.android.library")
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.android.library)
 }
 
 publishing {
@@ -39,7 +33,7 @@ publishing {
 android {
     namespace = project.group.toString()
     compileSdk = 33
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    namespace = "io.rebble.libpebblecommon"
     defaultConfig {
         minSdk = 21
         targetSdk = compileSdk
@@ -84,14 +78,7 @@ kotlin {
             }
         }
     }
-
-    val klockVersion = "2.4.13"
-    val ktorVersion = "1.6.7"
-    val coroutinesVersion = "1.8.0"
-    val uuidVersion = "0.4.1"
-    val kotlinxSerVersion = "1.5.0"
-    val kermitVersion = "2.0.0-RC4"
-
+
     sourceSets {
         all {
             languageSettings {
@@ -102,16 +89,15 @@ kotlin {
             }
         }
         sourceSets["commonMain"].dependencies {
-            implementation(kotlin("stdlib-common"))
-            implementation("com.benasher44:uuid:$uuidVersion")
-            implementation("com.soywiz.korlibs.klock:klock:$klockVersion")
-            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-            implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerVersion")
-            implementation("co.touchlab:kermit:$kermitVersion")
+            implementation(libs.uuid)
+            implementation(libs.klock)
+            implementation(libs.coroutines)
+            implementation(libs.serialization)
+            implementation(libs.kermit)
         }
 
         sourceSets["commonTest"].dependencies {
-            implementation(kotlin("test"))
+            implementation(libs.kotlin.test)
         }
 
         sourceSets["androidMain"].dependencies {
@@ -132,11 +118,11 @@ kotlin {
         }
 
         sourceSets["jvmTest"].dependencies {
-            implementation(kotlin("test"))
-            implementation(kotlin("test-junit"))
-            implementation("io.ktor:ktor-client-websockets:$ktorVersion")
-            implementation("io.ktor:ktor-client-cio:$ktorVersion")
-            implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
+            implementation(libs.kotlin.test)
+            implementation(libs.kotlin.test.junit)
+            implementation(libs.ktor.websockets)
+            implementation(libs.ktor.cio)
+            implementation(libs.ktor.okhttp)
         }
     }
 }

gradle.properties

@@ -6,5 +6,4 @@ org.gradle.jvmargs=-Xms128M -Xmx1G -XX:ReservedCodeCacheSize=200M
 kotlin.native.binary.memoryModel=experimental
 kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlinVersion=2.0.0
-agpVersion=7.4.0
-android.disableAutomaticComponentCreation=true
+agpVersion=8.1.4

gradle/libs.versions.toml

@@ -0,0 +1,27 @@
+[versions]
+agp = "8.1.4"
+kotlin = "2.0.0"
+klock = "2.4.13"
+ktor = "1.6.7"
+coroutine = "1.8.0"
+uuid = "0.4.1"
+serialization = "1.5.0"
+kermit = "2.0.0-RC4"
+
+[plugins]
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+
+[libraries]
+uuid = { module = "com.benasher44:uuid", version.ref = "uuid" }
+klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
+coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutine" }
+serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
+ktor-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
+ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+ktor-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Sun Apr 23 00:52:13 BST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -5,16 +5,6 @@ pluginManagement {
         gradlePluginPortal()
         maven { url = uri("https://jitpack.io") }
     }
-
-    val kotlinVersion: String by settings
-    val agpVersion: String by settings
-
-    plugins {
-        id("org.jetbrains.kotlin.multiplatform") version kotlinVersion
-        `maven-publish`
-        id("org.jetbrains.kotlin.plugin.serialization") version kotlinVersion
-        id("com.android.library") version agpVersion
-    }
 }
 
 rootProject.name = "libpebblecommon"