From 9a6bc3f73fb7820f5bad25286809f3481b626d89 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:23:36 -0400 Subject: [PATCH] added kotlin version property to gradle.properties --- build.gradle | 2 +- fabric/build.gradle | 3 +++ forge/build.gradle | 3 +++ gradle.properties | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d61693ed6..7b080ac26 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id "dev.architectury.loom" version "1.6-SNAPSHOT" apply(false) id "com.github.johnrengelman.shadow" version "7.0.0" apply(false) // Adds the Kotlin Gradle plugin - id 'org.jetbrains.kotlin.jvm' version '1.8.21' + id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}" id 'org.jetbrains.kotlin.plugin.lombok' version '2.0.20' } diff --git a/fabric/build.gradle b/fabric/build.gradle index e9cc1013f..115f67e0d 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -76,6 +76,9 @@ dependencies{ modCompileOnly("curse.maven:the-one-probe-fabric-581847:${project.top_fabric_file}") modCompileOnly "lol.bai.megane:megane-reborn-energy:${project.megane_version}" modCompileOnly "lol.bai.megane:megane-api:${project.megane_version}" + //include("org.jetbrains.kotlin:kotlin-reflect:${kotlin.coreLibrariesVersion}") + //include("org.jetbrains.kotlin:kotlin-stdlib:${kotlin.coreLibrariesVersion}") + //include("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin.coreLibrariesVersion}") } architectury { diff --git a/forge/build.gradle b/forge/build.gradle index 8c4ea98f6..85e9eb230 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -53,6 +53,9 @@ dependencies { minecraftRuntimeLibraries(group: 'com.github.Speiger', name: 'Primitive-Collections', version: '[0.8,0.9)') modImplementation("dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}") modImplementation("curse.maven:the-one-probe-245211:${rootProject.top_forge_file}") + //include("org.jetbrains.kotlin:kotlin-reflect:${kotlin.coreLibrariesVersion}") + //include("org.jetbrains.kotlin:kotlin-stdlib:${kotlin.coreLibrariesVersion}") + //include("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin.coreLibrariesVersion}") } processResources { diff --git a/gradle.properties b/gradle.properties index e80686a4c..13bada3f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,6 +26,7 @@ resourcefullib_version=0.0.5 structurelib_version=2.0.0-pre10 carbon_config_fabric_version=ec9yfAHJ carbon_config_forge_version=L3ipBBnb +kotlin_version=1.8.21 tesseract_version=2dffdd1914