ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Lorenz to 0.5.8 (#101)

Browse source
This commit is contained in:
Jason 2021-10-23 23:50:15 -07:00 committed by GitHub
parent 00e63c1716
commit d76e04dae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -1,7 +1,7 @@
# noinspection EditorConfigKeyCorrectness
[*.{kt,kts}]
max_line_length = 150
kotlin_imports_layout = ascii
ij_kotlin_imports_layout = ascii
no-wildcard-imports = no-wildcard-imports
ij_continuation_indent_size = 4
ij_kotlin_packages_to_use_import_on_demand = io.papermc.paperweight.util.**, io.papermc.paperweight.tasks.*, org.gradle.kotlin.dsl.*, kotlin.io.path.*

3
gradle.properties
View file

@ -1,2 +1,5 @@
group = io.papermc.paperweight
version = 1.1.13-SNAPSHOT
org.gradle.caching = true
org.gradle.parallel = true

6
gradle/libs.versions.toml
View file

@ -1,6 +1,6 @@
[versions]
asm = "9.1"
lorenz = "0.5.7"
lorenz = "0.5.8"
hypo = "1.2.1"
[libraries]
@ -29,8 +29,8 @@ jbsdiff = "io.sigpipe:jbsdiff:1.0"
# Gradle
gradle-licenser = "org.cadixdev.licenser:org.cadixdev.licenser.gradle.plugin:0.6.1"
gradle-shadow = "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:7.0.0"
gradle-ktlint = "org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:10.0.0"
gradle-shadow = "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:7.1.0"
gradle-ktlint = "org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:10.2.0"
gradle-kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:2.1.6"
gradle-plugin-kotlin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin" }

13
paperweight-lib/src/main/kotlin/util/utils.kt
View file

@ -263,13 +263,12 @@ fun toHex(hash: ByteArray): String {
}
fun JavaToolchainService.defaultJavaLauncher(project: Project): Provider<JavaLauncher> {
return launcherFor(project.extensions.getByType<JavaPluginExtension>().toolchain)
.orElse(
launcherFor {
// If the java plugin isn't applied, or no toolchain value was set
languageVersion.set(JavaLanguageVersion.of(16))
}
)
return launcherFor(project.extensions.getByType<JavaPluginExtension>().toolchain).orElse(
launcherFor {
// If the java plugin isn't applied, or no toolchain value was set
languageVersion.set(JavaLanguageVersion.of(16))
}
)
}
fun <P : Property<*>> P.withDisallowChanges(): P = apply { disallowChanges() }