Skip to content

Commit c3f1d42

Browse files
committed
consider your script built
1 parent 0a53137 commit c3f1d42

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

build.gradle.kts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ plugins {
55

66
val buildNum = providers.environmentVariable("GITHUB_RUN_NUMBER")
77
.filter(String::isNotEmpty)
8-
.map { "-build.$it" }
9-
.orElse("-local")
10-
.getOrElse("")
8+
.map { "build.$it" }
9+
.getOrElse("local")
1110

1211
val mcVer: String = libs.versions.minecraft.get()
13-
version = "6.0.7.0+mc$mcVer$buildNum"
12+
version = "6.0.7.0+$buildNum-mc$mcVer"
1413

1514
group = "com.simibubi.create"
1615

@@ -122,16 +121,10 @@ dependencies {
122121

123122
java {
124123
withSourcesJar()
125-
// loom requires java >= 21
126-
toolchain.languageVersion = JavaLanguageVersion.of(21)
124+
toolchain.languageVersion = JavaLanguageVersion.of(17)
127125
}
128126

129127
tasks.named<JavaCompile>("compileJava") {
130-
javaCompiler = javaToolchains.compilerFor {
131-
// 1.20.1 uses java 17
132-
languageVersion = JavaLanguageVersion.of(17)
133-
}
134-
135128
// this makes it possible to actually count errors after a big merge, since by default only 100 are shown
136129
options.compilerArgs.add("-Xmaxerrs")
137130
options.compilerArgs.add("10000")

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.name = "create-fabric-1.20.1"
1+
rootProject.name = "create-fabric"
22

33
pluginManagement {
44
repositories {

0 commit comments

Comments
 (0)