From 189399d5f872ecd633e781765c6bba04cbb2320f Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Thu, 28 Nov 2024 03:49:07 +0100 Subject: [PATCH] update to kotlin 2.1.0 --- .idea/libraries/KotlinJavaRuntime.xml | 20 ++++++++++---------- beanshell/build.gradle.kts | 2 +- build.gradle.kts | 4 ++-- codeCore/build.gradle.kts | 4 +--- codeGenCpu6502/build.gradle.kts | 4 +--- codeGenExperimental/build.gradle.kts | 4 +--- codeGenIntermediate/build.gradle.kts | 4 +--- codeOptimizers/build.gradle.kts | 4 +--- compiler/build.gradle.kts | 7 +++---- compilerAst/build.gradle.kts | 3 +-- gradle.properties | 2 -- intermediate/build.gradle.kts | 4 +--- virtualmachine/build.gradle.kts | 4 +--- 13 files changed, 24 insertions(+), 42 deletions(-) diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml index cf8a55908..4cc821ca4 100644 --- a/.idea/libraries/KotlinJavaRuntime.xml +++ b/.idea/libraries/KotlinJavaRuntime.xml @@ -1,23 +1,23 @@ - + - - + + - + - - + + - + - - + + - + \ No newline at end of file diff --git a/beanshell/build.gradle.kts b/beanshell/build.gradle.kts index 2a8300aa8..f4cd47b0a 100644 --- a/beanshell/build.gradle.kts +++ b/beanshell/build.gradle.kts @@ -1,8 +1,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - kotlin("jvm") id("application") + kotlin("jvm") } val serverMainClassName = "prog8lsp.MainKt" diff --git a/build.gradle.kts b/build.gradle.kts index 4ea44fa3a..4165a32e5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "2.0.21" + kotlin("jvm") version "2.1.0" } allprojects { @@ -7,4 +7,4 @@ allprojects { mavenLocal() mavenCentral() } -} \ No newline at end of file +} diff --git a/codeCore/build.gradle.kts b/codeCore/build.gradle.kts index ea15df63f..214a080ba 100644 --- a/codeCore/build.gradle.kts +++ b/codeCore/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/codeGenCpu6502/build.gradle.kts b/codeGenCpu6502/build.gradle.kts index 95009d1bc..2f139ea43 100644 --- a/codeGenCpu6502/build.gradle.kts +++ b/codeGenCpu6502/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/codeGenExperimental/build.gradle.kts b/codeGenExperimental/build.gradle.kts index a0a56c5c3..6ec5eb4e3 100644 --- a/codeGenExperimental/build.gradle.kts +++ b/codeGenExperimental/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/codeGenIntermediate/build.gradle.kts b/codeGenIntermediate/build.gradle.kts index ead4be761..b38f0cdd8 100644 --- a/codeGenIntermediate/build.gradle.kts +++ b/codeGenIntermediate/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/codeOptimizers/build.gradle.kts b/codeOptimizers/build.gradle.kts index dd19ad9db..6e414af2d 100644 --- a/codeOptimizers/build.gradle.kts +++ b/codeOptimizers/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 7f681703d..fa70a5a73 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -1,12 +1,11 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") // id("com.github.johnrengelman.shadow") version "8.1.1" - id("io.github.goooler.shadow") version "8.1.7" - id("com.peterabeles.gversion") version "1.10.2" + id("io.github.goooler.shadow") version "8.1.8" + id("com.peterabeles.gversion") version "1.10.3" } java { diff --git a/compilerAst/build.gradle.kts b/compilerAst/build.gradle.kts index 3c14a3716..9ffc5fa38 100644 --- a/compilerAst/build.gradle.kts +++ b/compilerAst/build.gradle.kts @@ -1,8 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/gradle.properties b/gradle.properties index c24dff178..710d4de58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,4 @@ org.gradle.console=rich org.gradle.parallel=true org.gradle.daemon=true kotlin.code.style=official -javaVersion=11 -kotlinVersion=2.0.21 version=10.6-SNAPSHOT diff --git a/intermediate/build.gradle.kts b/intermediate/build.gradle.kts index 0c73c0d1a..e0853bb99 100644 --- a/intermediate/build.gradle.kts +++ b/intermediate/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java { diff --git a/virtualmachine/build.gradle.kts b/virtualmachine/build.gradle.kts index 29b1f5d1d..0621ddd90 100644 --- a/virtualmachine/build.gradle.kts +++ b/virtualmachine/build.gradle.kts @@ -1,9 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id("java") - id("application") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } java {