Skip to content

Commit b65e62e

Browse files
committed
Toggle devFrontend with Gradle property
1 parent 463e7ee commit b65e62e

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

build-logic/src/main/kotlin/ext.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import org.gradle.api.file.ProjectLayout
66
import org.gradle.api.file.RegularFile
77
import org.gradle.api.plugins.BasePluginExtension
88
import org.gradle.api.provider.Provider
9+
import org.gradle.api.provider.ProviderFactory
910
import org.gradle.kotlin.dsl.getByType
1011
import org.gradle.language.jvm.tasks.ProcessResources
1112

12-
fun runProps(layout: ProjectLayout): Map<String, String> = mapOf(
13-
"squaremap.devFrontend" to "true",
13+
fun runProps(layout: ProjectLayout, providers: ProviderFactory): Map<String, String> = mapOf(
14+
"squaremap.devFrontend" to providers.gradleProperty("devFrontend").getOrElse("true"),
1415
"squaremap.frontendPath" to layout.settingsDirectory.dir("web").asFile.absolutePath,
1516
)
1617

fabric/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ tasks.remapJar {
5555
}
5656

5757
tasks.withType<net.fabricmc.loom.task.AbstractRunTask>().configureEach {
58-
runProps(layout).forEach { (key, value) ->
58+
runProps(layout, providers).forEach { (key, value) ->
5959
systemProperty(key, value)
6060
}
6161
}

neoforge/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ neoForge {
2222
}
2323
configureEach {
2424
loadedMods.set(emptySet())
25-
runProps(layout).forEach { (key, value) ->
25+
runProps(layout, providers).forEach { (key, value) ->
2626
systemProperty(key, value)
2727
}
2828
}

paper/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tasks {
4545
))
4646
}
4747
runServer {
48-
runProps(layout).forEach { (key, value) ->
48+
runProps(layout, providers).forEach { (key, value) ->
4949
systemProperty(key, value)
5050
}
5151
}

sponge/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ tasks {
7070
}
7171
}
7272
runServer {
73-
runProps(layout).forEach { (key, value) ->
73+
runProps(layout, providers).forEach { (key, value) ->
7474
systemProperty(key, value)
7575
}
7676
}

0 commit comments

Comments
 (0)