Skip to content

Commit b7da835

Browse files
committed
Merge branch 'dev'
2 parents 2501dfa + 37fd028 commit b7da835

File tree

3 files changed

+60
-42
lines changed

3 files changed

+60
-42
lines changed

build.gradle.kts

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ plugins {
4848
alias(libs.plugins.retry)
4949

5050
// Publishing to Maven Central
51-
id("org.jreleaser") version "1.17.0"
51+
alias(libs.plugins.jreleaser)
5252
id("maven-publish")
53+
alias(libs.plugins.gradle.plugin.publish)
5354
}
5455

5556
base {
@@ -368,42 +369,54 @@ spotless {
368369
}
369370
}
370371

371-
publishing {
372-
publications {
373-
create<MavenPublication>("maven") {
374-
pom {
375-
name = rootProject.name
376-
group = rootProject.group
377-
description = rootProject.description
378-
url = property("url").toString()
379-
inceptionYear = "2025"
372+
gradlePlugin {
373+
website = property("url").toString()
374+
vcsUrl = property("url").toString()
380375

381-
developers {
382-
developer {
383-
id = "aoqia"
384-
name = "aoqia"
385-
}
386-
}
376+
plugins {
377+
create("leafLoom") {
378+
id = "${rootProject.group}.${rootProject.name}"
379+
implementationClass = "${rootProject.group}.${rootProject.name}.LoomGradlePlugin"
380+
displayName = rootProject.name
381+
tags = listOf("projectzomboid", "zomboid", "leaf")
382+
}
383+
}
384+
}
387385

388-
issueManagement {
389-
system = "GitHub"
390-
url = "${property("url").toString()}/issues"
386+
publishing {
387+
publications.withType<MavenPublication>().configureEach {
388+
pom {
389+
name = rootProject.name
390+
group = rootProject.group
391+
description = rootProject.description
392+
url = property("url").toString()
393+
inceptionYear = "2025"
394+
395+
developers {
396+
developer {
397+
id = "aoqia"
398+
name = "aoqia"
391399
}
400+
}
392401

393-
licenses {
394-
license {
395-
name = "MIT"
396-
url = "https://spdx.org/licenses/MIT.html"
397-
}
398-
}
402+
issueManagement {
403+
system = "GitHub"
404+
url = "${property("url").toString()}/issues"
405+
}
399406

400-
scm {
401-
connection = "scm:git:${property("url").toString()}.git"
402-
developerConnection =
403-
"scm:git:${property("url").toString().replace("https", "ssh")}.git"
404-
url = property("url").toString()
407+
licenses {
408+
license {
409+
name = "MIT"
410+
url = "https://spdx.org/licenses/MIT.html"
405411
}
406412
}
413+
414+
scm {
415+
connection = "scm:git:${property("url").toString()}.git"
416+
developerConnection =
417+
"scm:git:${property("url").toString().replace("https", "ssh")}.git"
418+
url = property("url").toString()
419+
}
407420
}
408421
}
409422

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group = dev.aoqia.leaf
22
name = loom
33
description = The Gradle plugin for Leaf (fabric fork)
4-
version = 0.5.0
4+
version = 0.5.1
55
url = https://github.com/aoqia194/leaf-loom
66

77
kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
[versions]
2-
kotlin = "2.0.21"
2+
3+
access-widener = "2.1.0"
34
asm = "9.7.1"
45
commons-io = "2.15.1"
56
gson = "2.10.1"
67
guava = "33.0.0-jre"
7-
8-
stitch = "0.6.2"
9-
tiny-remapper = "0.11.1"
10-
access-widener = "2.1.0"
11-
mapping-io = "0.7.1"
8+
kotlin = "2.0.21"
9+
loom-native = "0.2.0"
1210
lorenz-tiny = "4.0.2"
11+
mapping-io = "0.7.1"
1312
mercury = "0.4.2"
14-
loom-native = "0.2.0"
13+
stitch = "0.6.2"
14+
tiny-remapper = "0.11.1"
1515

1616
# Plugins
17+
codenarc = "3.4.0"
18+
gradle-plugin-publish = "1.3.1"
19+
jreleaser = "1.17.0"
1720
spotless = "6.25.0"
1821
test-retry = "1.5.6"
19-
codenarc = "3.4.0"
2022

2123
[libraries]
22-
# Loom compile libraries
24+
2325
asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
2426
asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" }
2527
asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
@@ -38,14 +40,17 @@ fabric-lorenz-tiny = { module = "net.fabricmc:lorenz-tiny", version.ref = "loren
3840
fabric-mercury = { module = "net.fabricmc:mercury", version.ref = "mercury" }
3941
fabric-loom-nativelib = { module = "net.fabricmc:fabric-loom-native", version.ref = "loom-native" }
4042

41-
# Misc
4243
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
4344
kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }
4445

4546
[plugins]
47+
48+
gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }
49+
jreleaser = { id = "org.jreleaser", version.ref = "jreleaser" }
4650
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
47-
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
4851
retry = { id = "org.gradle.test-retry", version.ref = "test-retry" }
52+
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
4953

5054
[bundles]
55+
5156
asm = ["asm", "asm-analysis", "asm-commons", "asm-tree", "asm-util"]

0 commit comments

Comments
 (0)