Update to Kotlin 2.0.21 and revise dependency versions

Upgraded the Kotlin version from 2.0.0-RC1 to 2.0.21 and adjusted various dependencies to their latest versions. Added new Maven repository URLs and updated `.idea` project artifacts to reflect the new versioning and project setup.
This commit is contained in:
2024-10-26 14:25:55 +02:00
parent 3dbaef2266
commit 850f5dad8e
7 changed files with 29 additions and 13 deletions

View File

@@ -1,2 +1,2 @@
# Repo name # Repo name
settings.gradle settings.gradle.kts

1
.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
template

View File

@@ -0,0 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="template-js-1.0.0-SNAPSHOT">
<output-path>$PROJECT_DIR$/build/libs</output-path>
<root id="archive" name="template-js-1.0.0-SNAPSHOT.jar" />
</artifact>
</component>

View File

@@ -0,0 +1,6 @@
<component name="ArtifactManager">
<artifact type="jar" name="template-jvm-1.0.0-SNAPSHOT">
<output-path>$PROJECT_DIR$/build/libs</output-path>
<root id="archive" name="template-jvm-1.0.0-SNAPSHOT.jar" />
</artifact>
</component>

1
.idea/gradle.xml generated
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>

View File

@@ -1,14 +1,20 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
plugins { plugins {
kotlin("multiplatform") version "2.0.0-RC1" kotlin("multiplatform") version "2.0.21"
} }
group = "nl.astraeus" group = "nl.astraeus"
version = "1.0-SNAPSHOT" version = "1.0.0-SNAPSHOT"
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url = uri("https://gitea.astraeus.nl/api/packages/rnentjes/maven")
}
maven {
url = uri("https://gitea.astraeus.nl:8443/api/packages/rnentjes/maven")
}
} }
kotlin { kotlin {
@@ -16,7 +22,7 @@ kotlin {
jvm { jvm {
withJava() withJava()
} }
js(KotlinJsCompilerType.IR) { js {
binaries.executable() binaries.executable()
browser { browser {
distribution { distribution {
@@ -27,19 +33,15 @@ kotlin {
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {
dependencies { dependencies {
api("nl.astraeus:kotlin-css-generator:1.0.7") api("nl.astraeus:kotlin-css-generator:1.0.10")
implementation("io.github.microutils:kotlin-logging:3.0.5") implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
} }
} }
val commonTest by getting val commonTest by getting
val jvmMain by getting { val jvmMain by getting {
dependencies { dependencies {
implementation("org.slf4j:slf4j-api:2.0.9") implementation("io.undertow:undertow-core:2.3.14.Final")
implementation("org.slf4j:slf4j-simple:2.0.13")
implementation("io.undertow:undertow-core:2.3.12.Final")
implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0")
implementation("org.xerial:sqlite-jdbc:3.32.3.2") implementation("org.xerial:sqlite-jdbc:3.32.3.2")
@@ -47,7 +49,6 @@ kotlin {
implementation("nl.astraeus:simple-jdbc-stats:1.6.1") { implementation("nl.astraeus:simple-jdbc-stats:1.6.1") {
exclude(group = "org.slf4j", module = "slf4j-api") exclude(group = "org.slf4j", module = "slf4j-api")
} }
//implementation("nl.astraeus:simple-database-kotlin:2.0.8-SNAPSHOT")
} }
} }
val jvmTest by getting { val jvmTest by getting {
@@ -56,7 +57,7 @@ kotlin {
} }
val jsMain by getting { val jsMain by getting {
dependencies { dependencies {
implementation("nl.astraeus:kotlin-komponent-js:1.2.2") implementation("nl.astraeus:kotlin-komponent:1.2.4")
} }
} }
val jsTest by getting val jsTest by getting

View File

@@ -1,4 +1,5 @@
plugins { plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
} }
//var REPO_NAME = "template"
rootProject.name = "${REPO_NAME}" rootProject.name = "${REPO_NAME}"