Forge almost works

ValkyrienSkies · Oct 1, 2023 · d86e06a · d86e06a
1 parent abd18bc
commit d86e06a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id "architectury-plugin" version "3.4.146"
     id "dev.architectury.loom" version "1.3.355" apply false
     // Kotlin
-    id "org.jetbrains.kotlin.jvm" version "1.7.21" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.9.10" apply false
     // Kotlin linter
     id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     // Java linter

diff --git a/common/build.gradle b/common/build.gradle
@@ -19,8 +19,8 @@ dependencies {
     compileOnly("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
     compileOnly("org.valkyrienskies.core:impl:${rootProject.vs_core_version}")
 
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21"
-    api "org.jetbrains.kotlin:kotlin-reflect:1.7.21"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
+    api "org.jetbrains.kotlin:kotlin-reflect:1.9.10"
 }
 
 publishing {

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -53,16 +53,18 @@ dependencies {
     forge "net.minecraftforge:forge:${rootProject.forge_version}"
     modApi("org.valkyrienskies:valkyrienskies-118-forge:${rootProject.vs2_version}") { transitive = false }
 
-    compileOnly("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
-    compileOnly("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")
-    compileOnly("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
-    compileOnly("org.valkyrienskies.core:impl:${rootProject.vs_core_version}")
+    implementation("org.valkyrienskies.core:api:${rootProject.vs_core_version}")
+    implementation("org.valkyrienskies.core:api-game:${rootProject.vs_core_version}")
+    implementation("org.valkyrienskies.core:util:${rootProject.vs_core_version}")
+    implementation("org.valkyrienskies.core:impl:${rootProject.vs_core_version}")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-    // Add Kotlin for Forge.
-    forgeRuntimeLibrary('curse.maven:kotlinforforge-351264:3925887')
+    // Add actual kotlin
+    forgeRuntimeLibrary("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${rootProject.kotlin_version}")
+    forgeRuntimeLibrary("org.jetbrains.kotlin:kotlin-reflect:${rootProject.kotlin_version}")
+    forgeRuntimeLibrary("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -7,8 +7,8 @@ enabled_platforms=fabric,forge
 archives_base_name=eureka
 maven_group=org.valkyrienskies
 # Dependencies
-vs2_version=2.1.0-beta.15+3fd686019d
-vs_core_version=1.1.0+2daab9ad9f
+vs2_version=2.1.0-beta.15+15518313c1
+vs_core_version=1.1.0+01023bdb65
 minecraft_version=1.18.2
 architectury_version=4.10.86
 fabric_loader_version=0.14.10