diff --git a/README.md b/README.md index da88676..fd32553 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,12 @@ Add it as a dependency to your Gradle project: ```kotlin dependencies { - modImplementation("net.fabricmc:fabric-language-kotlin:1.12.3+kotlin.2.0.21") + modImplementation("net.fabricmc:fabric-language-kotlin:1.12.3+kotlin.2.1.0") } ``` +> **_NOTE:_** Kotlin 2.1 or later requires Loom 1.9 or later. + ### Adapter Use the `kotlin` adapter for your mod by setting the `adapter` property in the `fabric.mod.json` file. @@ -35,7 +37,7 @@ Remember to the add a dependency entry to your `fabric.mod.json` file: ] }, "depends": { - "fabric-language-kotlin": ">=1.12.3+kotlin.2.0.21" + "fabric-language-kotlin": ">=1.12.3+kotlin.2.1.0" } } ``` @@ -236,8 +238,8 @@ Companion objects can be used by appending `$Companion` to the class. ## Bundled libraries `org.jetbrains.kotlin` namespace: -- **`kotlin-stdlib`** 2.0.21 [Docs](https://kotlinlang.org/docs/home.html), [API docs](https://kotlinlang.org/api/latest/jvm/stdlib/), [GitHub](https://github.com/JetBrains/kotlin) -- **`kotlin-reflect`** 2.0.21 [Docs](https://kotlinlang.org/docs/reflection.html), [API docs](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.reflect/) +- **`kotlin-stdlib`** 2.1.0 [Docs](https://kotlinlang.org/docs/home.html), [API docs](https://kotlinlang.org/api/latest/jvm/stdlib/), [GitHub](https://github.com/JetBrains/kotlin) +- **`kotlin-reflect`** 2.1.0 [Docs](https://kotlinlang.org/docs/reflection.html), [API docs](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.reflect/) `org.jetbrains.kotlinx` namespace: - **`kotlinx-coroutines-core`** 1.9.0 [Guide](https://kotlinlang.org/docs/coroutines-guide.html), [API docs](https://kotlin.github.io/kotlinx.coroutines/), [GitHub](https://github.com/Kotlin/kotlinx.coroutines) @@ -245,10 +247,10 @@ Companion objects can be used by appending `$Companion` to the class. - **`kotlinx-serialization-core`** 1.7.3 [Guide](https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/serialization-guide.md), [API docs](https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-core/index.html), [GitHub](https://github.com/Kotlin/kotlinx.serialization) - **`kotlinx-serialization-json`** 1.7.3 [API docs](https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-json/index.html) - **`kotlinx-serialization-cbor`** 1.7.3 [API docs](https://kotlin.github.io/kotlinx.serialization/kotlinx-serialization-cbor/index.html) -- **`atomicfu`** 0.25.0 [GitHub](https://github.com/Kotlin/kotlinx.atomicfu) +- **`atomicfu`** 0.26.1 [GitHub](https://github.com/Kotlin/kotlinx.atomicfu) - **`kotlinx-datetime`** 0.6.1 [GitHub](https://github.com/Kotlin/kotlinx-datetime) -- **`kotlinx-io-core`** 0.5.4 [API docs](https://kotlin.github.io/kotlinx-io/kotlinx-io-core/index.html), [GitHub](https://github.com/Kotlin/kotlinx-io) -- **`kotlinx-io-bytestring`** 0.5.4 [API docs](https://kotlin.github.io/kotlinx-io/kotlinx-io-bytestring/index.html) +- **`kotlinx-io-core`** 0.6.0 [API docs](https://kotlin.github.io/kotlinx-io/kotlinx-io-core/index.html), [GitHub](https://github.com/Kotlin/kotlinx-io) +- **`kotlinx-io-bytestring`** 0.6.0 [API docs](https://kotlin.github.io/kotlinx-io/kotlinx-io-bytestring/index.html) ## Available Versions diff --git a/build.gradle b/build.gradle index 5809e70..369f697 100644 --- a/build.gradle +++ b/build.gradle @@ -6,10 +6,10 @@ buildscript { } plugins { - id 'fabric-loom' version '1.4.4' + id 'fabric-loom' version '1.9.1' id 'maven-publish' id "com.diffplug.spotless" version "6.19.0" - id 'me.modmuss50.mod-publish-plugin' version '0.4.1' + id 'me.modmuss50.mod-publish-plugin' version '0.8.1' } apply plugin: "org.jetbrains.kotlin.jvm" diff --git a/generated/kotlin_version.txt b/generated/kotlin_version.txt index eb4d1bc..50aea0e 100644 --- a/generated/kotlin_version.txt +++ b/generated/kotlin_version.txt @@ -1 +1 @@ -2.0.21 \ No newline at end of file +2.1.0 \ No newline at end of file diff --git a/generated/library_versions.json b/generated/library_versions.json index e98af7e..1650b51 100644 --- a/generated/library_versions.json +++ b/generated/library_versions.json @@ -1,16 +1,16 @@ { - "org.jetbrains.kotlin:kotlin-stdlib": "2.0.21", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8": "2.0.21", - "org.jetbrains.kotlin:kotlin-stdlib-jdk7": "2.0.21", - "org.jetbrains.kotlin:kotlin-reflect": "2.0.21", + "org.jetbrains.kotlin:kotlin-stdlib": "2.1.0", + "org.jetbrains.kotlin:kotlin-stdlib-jdk8": "2.1.0", + "org.jetbrains.kotlin:kotlin-stdlib-jdk7": "2.1.0", + "org.jetbrains.kotlin:kotlin-reflect": "2.1.0", "org.jetbrains.kotlinx:kotlinx-coroutines-core": "1.9.0", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm": "1.9.0", "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8": "1.9.0", "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm": "1.7.3", "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm": "1.7.3", "org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm": "1.7.3", - "org.jetbrains.kotlinx:atomicfu-jvm": "0.25.0", + "org.jetbrains.kotlinx:atomicfu-jvm": "0.26.1", "org.jetbrains.kotlinx:kotlinx-datetime-jvm": "0.6.1", - "org.jetbrains.kotlinx:kotlinx-io-core-jvm": "0.5.4", - "org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm": "0.5.4" + "org.jetbrains.kotlinx:kotlinx-io-core-jvm": "0.6.0", + "org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm": "0.6.0" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ae21b6e..a1b621e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,9 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx2G modId=fabric-language-kotlin -modVersion=1.12.3 +modVersion=1.13.0 minecraftVersion=1.20.2 mappingsVersion=1.20.2+build.4 -loaderVersion=0.14.24 +loaderVersion=0.16.9 group=net.fabricmc description=Fabric language module for Kotlin diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e83b48e..9b1b008 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,6 +19,6 @@ "license": "Apache-2.0", "icon": "assets/fabric-language-kotlin/icon500.png", "depends": { - "fabricloader": ">=0.14.24" + "fabricloader": ">=0.16.9" } } \ No newline at end of file