Bump kotlin version (#3)

* bump version
* fix plugin issues
* remove unused target
* remove yarn lock
* use gradle wrapper on github

---------

Co-authored-by: Alexandre Mommers <none@ygdrasil.io>

.github/workflows/gradle-publish.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Build and publish with Gradle
-      run: gradle build publish
+      run: ./gradlew build publish
       env:
         VERSION: ${{ github.event.release.tag_name }}
         USERNAME: ${{ secrets.GITLAB_USERNAME }}

.github/workflows/gradle.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
-        run: gradle build
+        run: ./gradlew build

.github/workflows/publish-web.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build and publish with Gradle
         run: gradle korge:jsBrowserProductionWebpack
       - name: Setup Pages

build.gradle.kts

@@ -1,8 +1,6 @@
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    alias(libs.plugins.multiplatform)
-    id("maven-publish")
+    alias(libs.plugins.multiplatform) apply false
 }
 
 val projectVersion = System.getenv("VERSION")?.takeIf { it.isNotBlank() }
@@ -16,39 +14,4 @@ allprojects {
 
 repositories {
     mavenCentral()
-}
-
-kotlin {
-
-    jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "11"
-        }
-        testRuns["test"].executionTask.configure {
-            useJUnit()
-        }
-    }
-
-    js(IR)
-    macosArm64()
-    macosX64()
-    linuxX64()
-    linuxArm64()
-    mingwX64()
-
-    publishing {
-        repositories {
-            maven {
-                name = "GitLab"
-                url = uri("https://gitlab.com/api/v4/projects/25805863/packages/maven")
-                credentials(HttpHeaderCredentials::class) {
-                    name = "Deploy-Token"
-                    value = System.getenv("TOKEN")
-                }
-                authentication {
-                    create<HttpHeaderAuthentication>("header")
-                }
-            }
-        }
-    }
 }

common-ui/build.gradle.kts

@@ -9,9 +9,9 @@ repositories {
 }
 
 dependencies {
-    implementation(rootProject)
+    api(project(":delaunator-kt"))
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
 }

delaunator-kt/build.gradle.kts

@@ -0,0 +1,44 @@
+
+plugins {
+    kotlin("multiplatform")
+    id("maven-publish")
+}
+
+repositories {
+    mavenCentral()
+}
+
+kotlin {
+
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "17"
+        }
+    }
+
+    js {
+        browser()
+        nodejs()
+    }
+    macosArm64()
+    macosX64()
+    linuxX64()
+    linuxArm64()
+    mingwX64()
+
+    publishing {
+        repositories {
+            maven {
+                name = "GitLab"
+                url = uri("https://gitlab.com/api/v4/projects/25805863/packages/maven")
+                credentials(HttpHeaderCredentials::class) {
+                    name = "Deploy-Token"
+                    value = System.getenv("TOKEN")
+                }
+                authentication {
+                    create<HttpHeaderAuthentication>("header")
+                }
+            }
+        }
+    }
+}

gradle/libs.versions.toml

@@ -1,20 +1,8 @@
 [versions]
-kotlin = "1.7.20"
-korge = "3.3.0"
-benchmark = "0.4.4"
-delaunator = "2022.07.01"
-atomicfu = "0.18.3"
-datetime = "0.4.0"
-compose = "1.2.0"
+kotlin = "1.9.10"
+compose = "1.5.1"
 
 [plugins]
-korge = { id = "com.soywiz.korge", version.ref = "korge" }
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 
-
-[libraries]
-delaunator = { module = "io.ygdrasil:delaunator-kt", version.ref = "delaunator" }
-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "benchmark" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jetpack-compose/build.gradle.kts

@@ -1,7 +1,6 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     kotlin("jvm")
     alias(libs.plugins.compose)
@@ -17,12 +16,11 @@ repositories {
 dependencies {
     implementation(compose.desktop.currentOs)
     implementation(project(":common-ui"))
-    implementation(rootProject)
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
 
     }
 }