Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump LibGui

Browse Source
This commit is contained in:
nea
2023-05-29 00:16:18 +02:00
parent 59ea00dabc
commit c133505e3b
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle.kts
View File

@@ -59,10 +59,7 @@ repositories {
mavenLocal() mavenLocal()
} }
val shadowMe by configurations.creating { val shadowMe by configurations.creating
configurations.implementation.get().extendsFrom(this)
}
val transInclude by configurations.creating { val transInclude by configurations.creating {
exclude(group = "com.mojang") exclude(group = "com.mojang")
exclude(group = "org.jetbrains.kotlin") exclude(group = "org.jetbrains.kotlin")
@@ -70,6 +67,11 @@ val transInclude by configurations.creating {
isTransitive = true isTransitive = true
} }
val nonModImplentation by configurations.creating {
extendsFrom(shadowMe)
configurations.implementation.get().extendsFrom(this)
}
dependencies { dependencies {
// Minecraft dependencies // Minecraft dependencies
"minecraft"(libs.minecraft) "minecraft"(libs.minecraft)
@@ -94,10 +96,10 @@ dependencies {
fun ktor(mod: String) = "io.ktor:ktor-$mod-jvm:${libs.versions.ktor.get()}" fun ktor(mod: String) = "io.ktor:ktor-$mod-jvm:${libs.versions.ktor.get()}"
transInclude(implementation(ktor("client-core"))!!) transInclude(nonModImplentation(ktor("client-core"))!!)
transInclude(implementation(ktor("client-java"))!!) transInclude(nonModImplentation(ktor("client-java"))!!)
transInclude(implementation(ktor("serialization-kotlinx-json"))!!) transInclude(nonModImplentation(ktor("serialization-kotlinx-json"))!!)
transInclude(implementation(ktor("client-content-negotiation"))!!) transInclude(nonModImplentation(ktor("client-content-negotiation"))!!)
// Dev environment preinstalled mods // Dev environment preinstalled mods
modRuntimeOnly(libs.bundles.runtime.required) modRuntimeOnly(libs.bundles.runtime.required)
@@ -147,14 +149,16 @@ tasks.processResources {
} }
tasks.scanLicenses { tasks.scanLicenses {
scanConfiguration(project.configurations.compileClasspath.get()) scanConfiguration(nonModImplentation)
scanConfiguration(configurations.modCompileClasspath.get())
outputFile.set(file("$buildDir/LICENSES-FIRMAMENT.json")) outputFile.set(file("$buildDir/LICENSES-FIRMAMENT.json"))
licenseFormatter.set(moe.nea.licenseextractificator.JsonLicenseFormatter()) licenseFormatter.set(moe.nea.licenseextractificator.JsonLicenseFormatter())
} }
tasks.create("printAllLicenses", LicenseDiscoveryTask::class.java, licensing).apply { tasks.create("printAllLicenses", LicenseDiscoveryTask::class.java, licensing).apply {
outputFile.set(file("$buildDir/LICENSES-FIRMAMENT.txt")) outputFile.set(file("$buildDir/LICENSES-FIRMAMENT.txt"))
licenseFormatter.set(moe.nea.licenseextractificator.TextLicenseFormatter()) licenseFormatter.set(moe.nea.licenseextractificator.TextLicenseFormatter())
scanConfiguration(project.configurations.compileClasspath.get()) scanConfiguration(nonModImplentation)
scanConfiguration(configurations.modCompileClasspath.get())
doLast { doLast {
println(outputFile.get().asFile.readText()) println(outputFile.get().asFile.readText())
} }

2
gradle/libs.versions.toml
View File

@@ -4,7 +4,7 @@ fabric_loader = "0.14.19"
fabric_api = "0.80.0+1.19.4" fabric_api = "0.80.0+1.19.4"
fabric_kotlin = "1.9.4+kotlin.1.8.21" fabric_kotlin = "1.9.4+kotlin.1.8.21"
yarn = "1.19.4+build.2" 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" rei = "11.0.597"
devauth = "1.0.0" devauth = "1.0.0"
modmenu = "6.2.1" modmenu = "6.2.1"