diff options
| author | nea <nea@nea.moe> | 2023-05-29 00:16:18 +0200 |
|---|---|---|
| committer | nea <nea@nea.moe> | 2023-05-29 00:16:18 +0200 |
| commit | c133505e3b1f8e5aeb62c1a0e99513ec4bfcf239 (patch) | |
| tree | ff312fd03692247e780c3923924d8d8d52cbf048 | |
| parent | 59ea00dabceeddf01fec7bf87ec548d7beedd7cc (diff) | |
| download | firmament-c133505e3b1f8e5aeb62c1a0e99513ec4bfcf239.tar.gz firmament-c133505e3b1f8e5aeb62c1a0e99513ec4bfcf239.tar.bz2 firmament-c133505e3b1f8e5aeb62c1a0e99513ec4bfcf239.zip | |
Bump LibGui
| -rw-r--r-- | build.gradle.kts | 24 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 6f5e93a..0c92701 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,10 +59,7 @@ repositories { mavenLocal() } -val shadowMe by configurations.creating { - configurations.implementation.get().extendsFrom(this) -} - +val shadowMe by configurations.creating val transInclude by configurations.creating { exclude(group = "com.mojang") exclude(group = "org.jetbrains.kotlin") @@ -70,6 +67,11 @@ val transInclude by configurations.creating { isTransitive = true } +val nonModImplentation by configurations.creating { + extendsFrom(shadowMe) + configurations.implementation.get().extendsFrom(this) +} + dependencies { // Minecraft dependencies "minecraft"(libs.minecraft) @@ -94,10 +96,10 @@ dependencies { fun ktor(mod: String) = "io.ktor:ktor-$mod-jvm:${libs.versions.ktor.get()}" - transInclude(implementation(ktor("client-core"))!!) - transInclude(implementation(ktor("client-java"))!!) - transInclude(implementation(ktor("serialization-kotlinx-json"))!!) - transInclude(implementation(ktor("client-content-negotiation"))!!) + transInclude(nonModImplentation(ktor("client-core"))!!) + transInclude(nonModImplentation(ktor("client-java"))!!) + transInclude(nonModImplentation(ktor("serialization-kotlinx-json"))!!) + transInclude(nonModImplentation(ktor("client-content-negotiation"))!!) // Dev environment preinstalled mods modRuntimeOnly(libs.bundles.runtime.required) @@ -147,14 +149,16 @@ tasks.processResources { } tasks.scanLicenses { - scanConfiguration(project.configurations.compileClasspath.get()) + scanConfiguration(nonModImplentation) + scanConfiguration(configurations.modCompileClasspath.get()) outputFile.set(file("$buildDir/LICENSES-FIRMAMENT.json")) licenseFormatter.set(moe.nea.licenseextractificator.JsonLicenseFormatter()) } tasks.create("printAllLicenses", LicenseDiscoveryTask::class.java, licensing).apply { outputFile.set(file("$buildDir/LICENSES-FIRMAMENT.txt")) licenseFormatter.set(moe.nea.licenseextractificator.TextLicenseFormatter()) - scanConfiguration(project.configurations.compileClasspath.get()) + scanConfiguration(nonModImplentation) + scanConfiguration(configurations.modCompileClasspath.get()) doLast { println(outputFile.get().asFile.readText()) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 80aba74..cda6e74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ fabric_loader = "0.14.19" fabric_api = "0.80.0+1.19.4" fabric_kotlin = "1.9.4+kotlin.1.8.21" yarn = "1.19.4+build.2" -libgui = "7.0.0-rc.1+1.19.4" +libgui = "7.1.0+1.19.4" rei = "11.0.597" devauth = "1.0.0" modmenu = "6.2.1" |