Skip to content

Commit 8028051

Browse files
ishlandishland
committed
build: Gradle 9.1.0
1 parent 99441da commit 8028051

8 files changed

Lines changed: 92 additions & 75 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: build
4444
run: ./gradlew build
4545
- name: upload to modrinth and curseforge
46-
run: ./gradlew modrinth curseforge
46+
run: ./gradlew modrinth publishMainPublicationToCurseForge
4747
if: github.ref == 'refs/heads/master'
4848
env:
4949
MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}

‎build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
plugins {
22
id 'fabric-loom' version '1.11-SNAPSHOT' apply false
3-
id 'com.github.johnrengelman.shadow' version '7.1.0' apply false
4-
id 'org.cadixdev.licenser' version '0.6.1' apply false
3+
id 'com.gradleup.shadow' version '9.2.1' apply false
4+
id 'dev.yumi.gradle.licenser' version '2.1.1' apply false
55
id 'com.modrinth.minotaur' version '2.+' apply false
6-
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
6+
id 'io.github.themrmilchmann.curseforge-publish' version '0.8.0' apply false
77
}
88

99
subprojects {
1010
apply plugin: 'java'
1111
apply plugin: 'java-library'
1212
apply plugin: 'maven-publish'
13-
apply plugin: 'org.cadixdev.licenser'
13+
apply plugin: 'dev.yumi.gradle.licenser'
1414

15-
sourceCompatibility = JavaVersion.VERSION_17
16-
targetCompatibility = JavaVersion.VERSION_17
15+
java {
16+
sourceCompatibility = JavaVersion.VERSION_17
17+
targetCompatibility = JavaVersion.VERSION_17
18+
}
1719

1820
version = project.mod_version + "." + getVersionSuffix()
1921

2022
license {
21-
header = rootProject.file('HEADER.txt')
23+
rule(rootProject.file('HEADER.txt'))
2224
}
2325

2426
repositories {
@@ -74,11 +76,9 @@ afterEvaluate {
7476
}
7577

7678
String getVersionSuffix() {
77-
def stdout = new ByteArrayOutputStream()
78-
exec {
79-
commandLine 'git', 'describe', '--tags', '--dirty'
80-
standardOutput = stdout
81-
}
79+
def stdout = providers.exec {
80+
commandLine 'git', 'describe', '--tags', '--dirty', '--broken'
81+
}.standardOutput.asText.get()
8282
stdout = stdout.toString().strip()
8383
def suffix = ""
8484
if (stdout.endsWith("-dirty")) {

‎buildSrc/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ plugins {
22
id 'java'
33
}
44

5-
sourceCompatibility = JavaVersion.VERSION_17
6-
targetCompatibility = JavaVersion.VERSION_17
5+
java {
6+
sourceCompatibility = JavaVersion.VERSION_17
7+
targetCompatibility = JavaVersion.VERSION_17
8+
}
79

810
repositories {
911
mavenCentral()

‎bungee/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ import java.nio.file.StandardCopyOption
33

44
evaluationDependsOn(":")
55

6-
apply plugin: 'com.github.johnrengelman.shadow'
6+
apply plugin: 'com.gradleup.shadow'
77
apply plugin: 'com.modrinth.minotaur'
88

9-
archivesBaseName = project.archives_base_name + "-bungee"
9+
base {
10+
archivesName = project.archives_base_name + "-bungee"
11+
}
1012
group = project.maven_group + ".bungee"
1113

1214
repositories {

‎fabric/build.gradle‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
evaluationDependsOn(":")
22

33
apply plugin: 'fabric-loom'
4-
apply plugin: 'com.github.johnrengelman.shadow'
4+
apply plugin: 'com.gradleup.shadow'
55
apply plugin: 'com.modrinth.minotaur'
6-
apply plugin: 'com.matthewprenger.cursegradle'
6+
apply plugin: 'io.github.themrmilchmann.curseforge-publish'
77

8-
archivesBaseName = project.archives_base_name + "-fabric"
8+
base {
9+
archivesName = project.archives_base_name + "-fabric"
10+
}
911
group = project.maven_group + ".fabric"
1012

1113
configurations {
@@ -109,55 +111,59 @@ modrinth {
109111
loaders = ["fabric", "quilt"]
110112
}
111113

112-
if (System.getenv("CURSEFORGE_TOKEN")) {
113-
curseforge {
114-
apiKey = System.getenv("CURSEFORGE_TOKEN")
115-
project {
116-
id = '631457'
117-
changelogType = "markdown"
118-
changelog = com.ishland.buildscript.ParseGItHubActionChangelog.getChangelog()
119-
releaseType = 'alpha'
120-
121-
addGameVersion "1.17"
122-
addGameVersion "1.17.1"
123-
addGameVersion "1.18"
124-
addGameVersion "1.18.1"
125-
addGameVersion "1.18.2"
126-
addGameVersion "1.19"
127-
addGameVersion "1.19.1"
128-
addGameVersion "1.19.2"
129-
addGameVersion "1.19.3"
130-
addGameVersion "1.19.4"
131-
addGameVersion "1.20"
132-
addGameVersion "1.20.1"
133-
addGameVersion "1.20.2"
134-
addGameVersion "1.20.3"
135-
addGameVersion "1.20.4"
136-
addGameVersion "1.20.5"
137-
addGameVersion "1.20.6"
138-
addGameVersion "1.21"
139-
addGameVersion "1.21.1"
140-
addGameVersion "1.21.2"
141-
addGameVersion "1.21.3"
142-
addGameVersion "1.21.4"
143-
addGameVersion "1.21.5"
144-
addGameVersion "1.21.6"
145-
addGameVersion "1.21.7"
146-
addGameVersion "1.21.8"
147-
addGameVersion "Fabric"
148-
addGameVersion "Java 17"
149-
addGameVersion "Java 18"
150-
addGameVersion "Java 19"
151-
addGameVersion "Java 20"
152-
addGameVersion "Java 21"
153-
addGameVersion "Java 22"
154-
155-
mainArtifact(remapShadowJar) {
156-
displayName = project.version + " devbuild"
157-
}
158-
}
159-
options {
160-
forgeGradleIntegration = false
161-
}
162-
}
114+
curseforge {
115+
apiToken = System.getenv("CURSEFORGE_TOKEN")
116+
publications {
117+
register("main") {
118+
projectId = "631457"
119+
120+
gameVersion("minecraft-1-17", "1.17")
121+
gameVersion("minecraft-1-17", "1.17.1")
122+
gameVersion("minecraft-1-18", "1.18")
123+
gameVersion("minecraft-1-18", "1.18.1")
124+
gameVersion("minecraft-1-18", "1.18.2")
125+
gameVersion("minecraft-1-19", "1.19")
126+
gameVersion("minecraft-1-19", "1.19.1")
127+
gameVersion("minecraft-1-19", "1.19.2")
128+
gameVersion("minecraft-1-19", "1.19.3")
129+
gameVersion("minecraft-1-19", "1.19.4")
130+
gameVersion("minecraft-1-20", "1.20")
131+
gameVersion("minecraft-1-20", "1.20.1")
132+
gameVersion("minecraft-1-20", "1.20.2")
133+
gameVersion("minecraft-1-20", "1.20.3")
134+
gameVersion("minecraft-1-20", "1.20.4")
135+
gameVersion("minecraft-1-20", "1.20.5")
136+
gameVersion("minecraft-1-20", "1.20.6")
137+
gameVersion("minecraft-1-21", "1.21")
138+
gameVersion("minecraft-1-21", "1.21.1")
139+
gameVersion("minecraft-1-21", "1.21.2")
140+
gameVersion("minecraft-1-21", "1.21.3")
141+
gameVersion("minecraft-1-21", "1.21.4")
142+
gameVersion("minecraft-1-21", "1.21.5")
143+
gameVersion("minecraft-1-21", "1.21.6")
144+
gameVersion("minecraft-1-21", "1.21.7")
145+
gameVersion("minecraft-1-21", "1.21.8")
146+
gameVersion("modloader", "fabric")
147+
gameVersion("java", "Java 22")
148+
gameVersion("java", "Java 21")
149+
gameVersion("java", "Java 20")
150+
gameVersion("java", "Java 19")
151+
gameVersion("java", "Java 18")
152+
gameVersion("java", "Java 17")
153+
gameVersion("environment", "Server")
154+
gameVersion("environment", "Client")
155+
156+
artifacts.register("main") {
157+
from(remapShadowJar)
158+
159+
displayName = project.version + " devbuild"
160+
releaseType = io.github.themrmilchmann.gradle.publish.curseforge.ReleaseType.ALPHA
161+
162+
changelog {
163+
format = io.github.themrmilchmann.gradle.publish.curseforge.ChangelogFormat.MARKDOWN
164+
from(com.ishland.buildscript.ParseGitHubActionChangelog.getChangelog())
165+
}
166+
}
167+
}
168+
}
163169
}

‎gradle.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
org.gradle.jvmargs=-Xmx4G
33
org.gradle.parallel=true
44

5+
gradle-curseforge-publish.interop.fabric-loom=false
6+
gradle-curseforge-publish.interop.forge-gradle=false
7+
gradle-curseforge-publish.interop.neoforged=false
8+
gradle-curseforge-publish.interop.neogradle=false
9+
510
# Fabric Properties
611
# check these on https://fabricmc.net/develop
712
#

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎velocity/build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@ import java.nio.file.StandardCopyOption
44

55
evaluationDependsOn(":")
66

7-
apply plugin: 'com.github.johnrengelman.shadow'
7+
apply plugin: 'com.gradleup.shadow'
88
apply plugin: 'com.modrinth.minotaur'
99

1010
afterEvaluate {
1111
license {
12-
header = project.file('HEADER.txt')
12+
rule(project.file('HEADER.txt'))
1313
}
1414
}
1515

16-
archivesBaseName = project.archives_base_name + "-velocity"
16+
base {
17+
archivesName = project.archives_base_name + "-velocity"
18+
}
1719
group = project.maven_group + ".velocity"
1820

1921
repositories {

0 commit comments

Comments
 (0)