Skip to content

Commit 297d26d

Browse files
moehreagmoehreag
committed
[skip] fix build scripts
1 parent 2bd9640 commit 297d26d

File tree

6 files changed

+34
-16
lines changed

6 files changed

+34
-16
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: 21
2727

2828
- name: Setup Gradle
29-
uses: gradle/actions/gradle-build@v4
29+
uses: gradle/actions/setup-gradle@v4
3030
with:
3131
cache-read-only: true
3232

‎1.16_combat-6/build.gradle.kts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ publishing {
109109
}
110110
}
111111

112+
tasks.modrinth {
113+
dependsOn(tasks.getByName("optimizeOutputsOfRemapJar"))
114+
}
115+
112116
modrinth {
113117
token = System.getenv("MODRINTH_TOKEN")
114118
projectId = "p2rxzX0q"
@@ -127,7 +131,7 @@ modrinth {
127131
// License: MIT
128132
val changelogText = file("../CHANGELOG.md").readText()
129133
val regexVersion =
130-
((project.version) as String).split("\\+")[0].replace("\\.".toRegex(), "/\\./").replace("\\+".toRegex(), "\\+")
134+
((project.version) as String).split("+")[0].replace("\\.".toRegex(), "\\.").replace("\\+".toRegex(), "+")
131135
val changelogRegex = "###? ${regexVersion}\\n\\n(( *- .+\\n)+)".toRegex()
132136
val matcher = changelogRegex.find(changelogText)
133137

@@ -136,8 +140,7 @@ modrinth {
136140

137141
val changelogLines = changelogText.split("\n")
138142
val linkRefRegex = "^\\[([A-z0-9 _\\-/+.]+)]: ".toRegex()
139-
for (i in (changelogLines.size - 1)..0 step -1) {
140-
val line = changelogLines[i]
143+
for (line in changelogLines.reversed()) {
141144
if ((linkRefRegex.matches(line)))
142145
changelogContent += "\n" + line
143146
else break

‎1.20/build.gradle.kts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ publishing {
109109
}
110110
}
111111

112+
tasks.modrinth {
113+
dependsOn(tasks.getByName("optimizeOutputsOfRemapJar"))
114+
}
115+
112116
modrinth {
113117
token = System.getenv("MODRINTH_TOKEN")
114118
projectId = "p2rxzX0q"
@@ -126,7 +130,8 @@ modrinth {
126130
// https://github.com/LambdAurora/LambDynamicLights/blob/1ef85f486084873b5d97b8a08df72f57859a3295/build.gradle#L145
127131
// License: MIT
128132
val changelogText = file("../CHANGELOG.md").readText()
129-
val regexVersion = ((project.version) as String).split("\\+")[0].replace("\\.".toRegex(), "/\\./").replace("\\+".toRegex(), "\\+")
133+
val regexVersion =
134+
((project.version) as String).split("+")[0].replace("\\.".toRegex(), "\\.").replace("\\+".toRegex(), "+")
130135
val changelogRegex = "###? ${regexVersion}\\n\\n(( *- .+\\n)+)".toRegex()
131136
val matcher = changelogRegex.find(changelogText)
132137

@@ -135,8 +140,7 @@ modrinth {
135140

136141
val changelogLines = changelogText.split("\n")
137142
val linkRefRegex = "^\\[([A-z0-9 _\\-/+.]+)]: ".toRegex()
138-
for (i in (changelogLines.size -1)..0 step -1) {
139-
val line = changelogLines[i]
143+
for (line in changelogLines.reversed()) {
140144
if ((linkRefRegex.matches(line)))
141145
changelogContent += "\n" + line
142146
else break

‎1.21.4/build.gradle.kts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ publishing {
118118
}
119119
}
120120

121+
tasks.modrinth {
122+
dependsOn(tasks.getByName("optimizeOutputsOfRemapJar"))
123+
}
124+
121125
modrinth {
122126
token = System.getenv("MODRINTH_TOKEN")
123127
projectId = "p2rxzX0q"
@@ -135,7 +139,8 @@ modrinth {
135139
// https://github.com/LambdAurora/LambDynamicLights/blob/1ef85f486084873b5d97b8a08df72f57859a3295/build.gradle#L145
136140
// License: MIT
137141
val changelogText = file("../CHANGELOG.md").readText()
138-
val regexVersion = ((project.version) as String).split("\\+")[0].replace("\\.".toRegex(), "/\\./").replace("\\+".toRegex(), "\\+")
142+
val regexVersion =
143+
((project.version) as String).split("+")[0].replace("\\.".toRegex(), "\\.").replace("\\+".toRegex(), "+")
139144
val changelogRegex = "###? ${regexVersion}\\n\\n(( *- .+\\n)+)".toRegex()
140145
val matcher = changelogRegex.find(changelogText)
141146

@@ -144,8 +149,7 @@ modrinth {
144149

145150
val changelogLines = changelogText.split("\n")
146151
val linkRefRegex = "^\\[([A-z0-9 _\\-/+.]+)]: ".toRegex()
147-
for (i in (changelogLines.size -1)..0 step -1) {
148-
val line = changelogLines[i]
152+
for (line in changelogLines.reversed()) {
149153
if ((linkRefRegex.matches(line)))
150154
changelogContent += "\n" + line
151155
else break

‎1.21/build.gradle.kts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ publishing {
111111
}
112112
}
113113

114+
tasks.modrinth {
115+
dependsOn(tasks.getByName("optimizeOutputsOfRemapJar"))
116+
}
117+
114118
modrinth {
115119
token = System.getenv("MODRINTH_TOKEN")
116120
projectId = "p2rxzX0q"
@@ -128,7 +132,8 @@ modrinth {
128132
// https://github.com/LambdAurora/LambDynamicLights/blob/1ef85f486084873b5d97b8a08df72f57859a3295/build.gradle#L145
129133
// License: MIT
130134
val changelogText = file("../CHANGELOG.md").readText()
131-
val regexVersion = ((project.version) as String).split("\\+")[0].replace("\\.".toRegex(), "/\\./").replace("\\+".toRegex(), "\\+")
135+
val regexVersion =
136+
((project.version) as String).split("+")[0].replace("\\.".toRegex(), "\\.").replace("\\+".toRegex(), "+")
132137
val changelogRegex = "###? ${regexVersion}\\n\\n(( *- .+\\n)+)".toRegex()
133138
val matcher = changelogRegex.find(changelogText)
134139

@@ -137,8 +142,7 @@ modrinth {
137142

138143
val changelogLines = changelogText.split("\n")
139144
val linkRefRegex = "^\\[([A-z0-9 _\\-/+.]+)]: ".toRegex()
140-
for (i in (changelogLines.size -1)..0 step -1) {
141-
val line = changelogLines[i]
145+
for (line in changelogLines.reversed()) {
142146
if ((linkRefRegex.matches(line)))
143147
changelogContent += "\n" + line
144148
else break

‎1.8.9/build.gradle.kts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ publishing {
146146
}
147147
}
148148

149+
tasks.modrinth {
150+
dependsOn(tasks.getByName("optimizeOutputsOfRemapJar"))
151+
}
152+
149153
modrinth {
150154
token = System.getenv("MODRINTH_TOKEN")
151155
projectId = "p2rxzX0q"
@@ -165,7 +169,7 @@ modrinth {
165169
// License: MIT
166170
val changelogText = file("../CHANGELOG.md").readText()
167171
val regexVersion =
168-
((project.version) as String).split("\\+")[0].replace("\\.".toRegex(), "/\\./").replace("\\+".toRegex(), "\\+")
172+
((project.version) as String).split("+")[0].replace("\\.".toRegex(), "\\.").replace("\\+".toRegex(), "+")
169173
val changelogRegex = "###? ${regexVersion}\\n\\n(( *- .+\\n)+)".toRegex()
170174
val matcher = changelogRegex.find(changelogText)
171175

@@ -174,8 +178,7 @@ modrinth {
174178

175179
val changelogLines = changelogText.split("\n")
176180
val linkRefRegex = "^\\[([A-z0-9 _\\-/+.]+)]: ".toRegex()
177-
for (i in (changelogLines.size - 1)..0 step -1) {
178-
val line = changelogLines[i]
181+
for (line in changelogLines.reversed()) {
179182
if ((linkRefRegex.matches(line)))
180183
changelogContent += "\n" + line
181184
else break

0 commit comments

Comments
 (0)