zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

build updates

Browse source
This commit is contained in:
Jason Penilla 2022-02-28 13:22:30 -07:00 • committed by Jason
parent 1c02da5116
commit 33c51967e2
6 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build-logic/settings.gradle.kts
View file

@ -1,10 +1,8 @@
import ca.stellardrift.build.configurate.ConfigFormats import ca.stellardrift.build.configurate.ConfigFormats
import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
enableFeaturePreview("VERSION_CATALOGS")
plugins { plugins {
id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0" id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
} }
extensions.configure<PolyglotVersionCatalogExtension> { extensions.configure<PolyglotVersionCatalogExtension> {

2
build-logic/src/main/kotlin/extensions.kt
View file

@ -4,11 +4,9 @@ import org.gradle.api.provider.Provider
// set by GitHub Actions // set by GitHub Actions
val Project.ci: Provider<Boolean> val Project.ci: Provider<Boolean>
get() = providers.environmentVariable("CI") get() = providers.environmentVariable("CI")
.forUseAtConfigurationTime()
.map { it.toBoolean() } .map { it.toBoolean() }
.orElse(false) .orElse(false)
val Project.compileExamples: Boolean val Project.compileExamples: Boolean
get() = providers.gradleProperty("compile-examples") get() = providers.gradleProperty("compile-examples")
.forUseAtConfigurationTime()
.isPresent .isPresent

4
examples/example-bukkit/build.gradle.kts
View file

@ -30,7 +30,7 @@ tasks {
dependsOn(shadowJar) dependsOn(shadowJar)
} }
runServer { runServer {
minecraftVersion("1.18.1") minecraftVersion("1.18.2")
runDirectory(file("run/latest")) runDirectory(file("run/latest"))
javaLauncher.set(project.javaToolchains.launcherFor { javaLauncher.set(project.javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(17)) languageVersion.set(JavaLanguageVersion.of(17))
@ -40,7 +40,7 @@ tasks {
// Setup a run task for each supported version // Setup a run task for each supported version
mapOf( mapOf(
setOf("1.8.8", "1.9.4", "1.10.2", "1.11.2") to 11, setOf("1.8.8", "1.9.4", "1.10.2", "1.11.2") to 11,
setOf("1.12.2", "1.13.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.1") to 17, setOf("1.12.2", "1.13.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.2") to 17,
).forEach { (minecraftVersions, javaVersion) -> ).forEach { (minecraftVersions, javaVersion) ->
for (version in minecraftVersions) { for (version in minecraftVersions) {
createVersionedRun(version, javaVersion) createVersionedRun(version, javaVersion)

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
settings.gradle.kts
View file

@ -11,7 +11,7 @@ pluginManagement {
} }
plugins { plugins {
id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0" id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
} }
rootProject.name = "cloud" rootProject.name = "cloud"