Skip to content

Commit 06d7af8

Browse files
authored
0.18.1 loader fix, version bump (#64)
* Bump versions, fix warning with quilt loader >=0.18.1, fix single wrong license This api doesnt exist on <0.18.1 so gotta depend, seems pretty stable by now though * Fix build, see fabric-loom/#842 * Sync with flk 1.9.2+kotlin.1.8.10
1 parent edf82f3 commit 06d7af8

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

core/src/main/kotlin/org/quiltmc/qkl/core/adapter/KotlinAdapter.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package org.quiltmc.qkl.core.adapter
1919
import org.quiltmc.loader.api.LanguageAdapter
2020
import org.quiltmc.loader.api.LanguageAdapterException
2121
import org.quiltmc.loader.api.ModContainer
22-
import org.quiltmc.loader.impl.launch.common.QuiltLauncherBase
2322
import org.quiltmc.loader.impl.util.DefaultLanguageAdapter
2423
import java.lang.reflect.Proxy
2524
import kotlin.reflect.KProperty1
@@ -50,7 +49,7 @@ public open class KotlinAdapter : LanguageAdapter {
5049
Class.forName(
5150
splitMethod[0],
5251
true,
53-
QuiltLauncherBase.getLauncher().targetClassLoader
52+
mod.classLoader
5453
)
5554
} catch (error: ClassNotFoundException) {
5655
throw LanguageAdapterException(error)
@@ -115,7 +114,7 @@ public open class KotlinAdapter : LanguageAdapter {
115114

116115
// Return a proxy of T that calls the method
117116
return Proxy.newProxyInstance(
118-
QuiltLauncherBase.getLauncher().targetClassLoader,
117+
mod.classLoader,
119118
arrayOf(type)
120119
) { _, _, _ ->
121120
methods[0].call(instance)

core/src/main/resources/quilt.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"depends": [
2323
{
2424
"id": "quilt_loader",
25-
"versions": ">=0.17.0"
25+
"versions": ">=0.18.1"
2626
}
2727
],
2828
"provides": [

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ org.gradle.parallel=true
55
kotlin.incremental=true
66
kotlin.code.style=official
77

8-
version=1.1.0
9-
flkVersion=1.9.0
8+
version=1.1.1
9+
flkVersion=1.9.2

gradle/libs.versions.toml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[versions]
2-
atomic = "0.19.0"
2+
atomic = "0.20.0"
33
coroutines = "1.6.4"
44
datetime = "0.4.0"
55
dokka = "1.7.20"
6-
kotlin = "1.8.0"
6+
kotlin = "1.8.10"
77
minecraft = "1.19.3"
8-
qsl = "4.0.0-beta.1+1.19.3"
9-
quilt_loader = "0.17.8"
8+
qsl = "4.0.0-beta.9+1.19.3"
9+
quilt_loader = "0.18.3"
1010
quilt_mappings = "1.19.3+build.5"
11-
serialization = "1.4.1"
12-
serialization_plugin = "1.8.0" # usually same as kotlin but can lag behind
11+
serialization = "1.5.0"
12+
serialization_plugin = "1.8.10" # usually same as kotlin but can lag behind
13+
binary_compat_plugin = "0.12.1"
1314

1415
[libraries]
1516
atomic = { module = "org.jetbrains.kotlinx:atomicfu-jvm", version.ref = "atomic" }
@@ -34,4 +35,4 @@ kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
3435
licenser = { id = "org.quiltmc.gradle.licenser", version = "1.2.0" }
3536
quilt_loom = { id = "org.quiltmc.loom", version = "1.+" }
3637
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "serialization_plugin" }
37-
binary_compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.12.1" }
38+
binary_compatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary_compat_plugin" }

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector2fOps.kt

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/*
2+
* DO NOT EDIT MANUALLY | THIS FILE WAS GENERATED BY https://github.com/SilverAndro/qkl_math_codegen
3+
*
24
* Copyright 2023 QuiltMC
35
*
46
* Licensed under the Apache License, Version 2.0 (the "License");

library/src/main/resources/quilt.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"depends": [
2323
{
2424
"id": "quilt_loader",
25-
"versions": ">=0.17.0"
25+
"versions": ">=0.18.1"
2626
}
2727
]
2828
},

src/main/resources/quilt.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"depends": [
2323
{
2424
"id": "quilt_loader",
25-
"versions": ">=0.17.0-beta.3"
25+
"versions": ">=0.18.1"
2626
},
2727
{
2828
"id": "qkl_core",

0 commit comments

Comments
 (0)