From e86d9cd60e9e3312b8726c3c844a4fd89763884b Mon Sep 17 00:00:00 2001 From: Armin Zavada Date: Wed, 5 Jun 2024 14:14:37 +0200 Subject: [PATCH] Updated Kotlin to 2.0.0 --- build.gradle.kts | 3 +-- buildSrc/build.gradle.kts | 1 - engine/build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 58e3bb99..bcfcc05a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,11 +5,10 @@ */ plugins { - alias(libs.plugins.versions) id("hu.bme.mit.semantifyr.gradle.eclipse") } tasks.wrapper { - version = "8.3" + version = "8.8" distributionType = Wrapper.DistributionType.ALL } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fb144162..abe57cce 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -6,7 +6,6 @@ plugins { `kotlin-dsl` - alias(libs.plugins.versions) } repositories { diff --git a/engine/build.gradle.kts b/engine/build.gradle.kts index 43649eed..e050f524 100644 --- a/engine/build.gradle.kts +++ b/engine/build.gradle.kts @@ -8,7 +8,7 @@ import org.apache.tools.ant.taskdefs.condition.Os plugins { id("hu.bme.mit.semantifyr.gradle.conventions.application") - kotlin("jvm") version "1.9.10" + alias(libs.plugins.kotlin.jvm) } kotlin { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d0749f5..8775c8ad 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ mockito = "5.5.0" mwe2 = "2.15.0" slf4j = "2.0.9" xtext = "2.32.0" -kotlin = '1.9.10' +kotlin = '2.0.0' viatra = '2.8.0' [libraries] @@ -41,4 +41,4 @@ viatra-query-runtime = { group = 'org.eclipse.viatra', name = 'viatra-query-runt viatra-transformation-runtime = { group = 'org.eclipse.viatra', name = 'viatra-transformation-runtime', version.ref = "viatra" } [plugins] -versions = { id = "com.github.ben-manes.versions", version = "0.48.0" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }