Username404-59
/
SnowyGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the kotlin libraries

This commit is contained in:
Username404-59 2021-05-07 10:33:35 +02:00
parent 82af939f7e
commit 25a5380166
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -78,9 +78,9 @@ subprojects {
} }
repositories { maven(url = "https://jitpack.io") } repositories { maven(url = "https://jitpack.io") }
dependencies { dependencies {
implementation("$kotlinX:kotlinx-coroutines-core:1.4.0") implementation("$kotlinX:kotlinx-coroutines-core:1.5.0-RC")
listOf( listOf(
"$kotlinX:kotlinx-datetime:0.1.1", "$kotlinX:kotlinx-datetime:0.2.0",
"com.typesafe:config:1.4.1", "com.typesafe:config:1.4.1",
"io.github.config4k:config4k:0.4.2" "io.github.config4k:config4k:0.4.2"
).forEach { implementation(it); shadowC(it) { isTransitive = false } } ).forEach { implementation(it); shadowC(it) { isTransitive = false } }
@ -160,7 +160,9 @@ allprojects {
val modProperties = mapOf( val modProperties = mapOf(
"mod_version" to (rootProject.version as String), "mod_version" to (rootProject.version as String),
"minecraft_version" to mcBase, "minecraft_version" to mcBase,
"mod_group" to this@allprojects.group "mod_group" to this@allprojects.group,
"fabric_kotlin" to rootProject.property("fabric_language_kotlin"),
"kotlinforforge" to rootProject.property("kotlinforforge")
) )
inputs.properties(modProperties) inputs.properties(modProperties)
filesNotMatching(listOf("*.png")) { filesNotMatching(listOf("*.png")) {

2
fabric/build.gradle.kts
View File

@ -17,7 +17,7 @@ dependencies {
include(modApi("${Groups.FabricApi}:fabric-rendering-v1:${rootProject.property("fabric_rendering_api_version")}")!!) include(modApi("${Groups.FabricApi}:fabric-rendering-v1:${rootProject.property("fabric_rendering_api_version")}")!!)
include(modApi("${Groups.FabricApi}:fabric-api-base:${rootProject.property("fabric_api_base_version")}")!!) include(modApi("${Groups.FabricApi}:fabric-api-base:${rootProject.property("fabric_api_base_version")}")!!)
include(modRuntime("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")!!) include(modRuntime("${Groups.FabricApi}:fabric-resource-loader-v0:${rootProject.property("fabric_resource_loader_version")}")!!)
modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.5.0+kotlin.1.4.31") modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = rootProject.property("fabric_language_kotlin") as String)
modRuntime(modCompileOnly("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}") { modRuntime(modCompileOnly("com.terraformersmc:modmenu:${rootProject.property("modmenu_version")}") {
exclude(group = Groups.FabricApi, module = "fabric-api-base") exclude(group = Groups.FabricApi, module = "fabric-api-base")
exclude(group = Groups.FabricApi, module = "fabric-resource-loader-v0") exclude(group = Groups.FabricApi, module = "fabric-resource-loader-v0")

2
fabric/src/main/resources/fabric.mod.json
View File

@ -32,7 +32,7 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.9.3", "fabricloader": ">=0.9.3",
"fabric-language-kotlin": ">=1.4.0+build.1", "fabric-language-kotlin": ">=${fabric_kotlin}",
"fabric-resource-loader-v0": "*", "fabric-resource-loader-v0": "*",
"fabric-rendering-v1": "*", "fabric-rendering-v1": "*",
"minecraft": ">=${minecraft_version}" "minecraft": ">=${minecraft_version}"

2
forge/build.gradle.kts
View File

@ -4,7 +4,7 @@ repositories {
} }
dependencies { dependencies {
forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}.+") forge("net.minecraftforge:forge:${rootProject.architectury.minecraft}-${rootProject.property("forge_version")}.+")
implementation("thedarkcolour:kotlinforforge:1.9.0") implementation("thedarkcolour:kotlinforforge:${rootProject.property("kotlinforforge")}.0")
implementation(project(path = ":common")) { isTransitive = false } implementation(project(path = ":common")) { isTransitive = false }
add("developmentForge", project(path = ":common")) { isTransitive = false } add("developmentForge", project(path = ":common")) { isTransitive = false }
shadowC(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false } shadowC(project(path = ":common", configuration = "transformProductionForge")) { isTransitive = false }

2
forge/src/main/resources/META-INF/mods.toml
View File

@ -1,5 +1,5 @@
modLoader = "kotlinforforge" modLoader = "kotlinforforge"
loaderVersion = "[1.9,)" loaderVersion = "[${kotlinforforge},)"
issueTrackerURL = "https://gits.username404.fr/Username404-59/SnowyGUI/issues" issueTrackerURL = "https://gits.username404.fr/Username404-59/SnowyGUI/issues"
license = "MPL-2.0" license = "MPL-2.0"

4
gradle.properties
View File

@ -9,8 +9,10 @@ org.gradle.vfs.watch=true
minecraft=1.16.5 minecraft=1.16.5
forge_version=36.1 forge_version=36.1
kotlin_stdlib_version=1.4 kotlinforforge=1.12
kotlin_stdlib_version=1.5
fabric_loader_version=0.11.3 fabric_loader_version=0.11.3
fabric_language_kotlin=1.6.0+kotlin.1.5.0
fabric_resource_loader_version=0.2.5+059ea8667c fabric_resource_loader_version=0.2.5+059ea8667c
fabric_rendering_api_version=1.1.2+346247d77c fabric_rendering_api_version=1.1.2+346247d77c
fabric_api_base_version=0.1.3+12a8474c7c fabric_api_base_version=0.1.3+12a8474c7c