diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 5bae36107..f2773c457 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -1,10 +1,8 @@ import ca.stellardrift.build.configurate.ConfigFormats import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension -enableFeaturePreview("VERSION_CATALOGS") - plugins { - id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0" + id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1" } extensions.configure { diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt index 8b48967df..a051ccb90 100644 --- a/build-logic/src/main/kotlin/extensions.kt +++ b/build-logic/src/main/kotlin/extensions.kt @@ -4,11 +4,9 @@ import org.gradle.api.provider.Provider // set by GitHub Actions val Project.ci: Provider get() = providers.environmentVariable("CI") - .forUseAtConfigurationTime() .map { it.toBoolean() } .orElse(false) val Project.compileExamples: Boolean get() = providers.gradleProperty("compile-examples") - .forUseAtConfigurationTime() .isPresent diff --git a/examples/example-bukkit/build.gradle.kts b/examples/example-bukkit/build.gradle.kts index b90a6f360..fb6e22fe7 100644 --- a/examples/example-bukkit/build.gradle.kts +++ b/examples/example-bukkit/build.gradle.kts @@ -30,7 +30,7 @@ tasks { dependsOn(shadowJar) } runServer { - minecraftVersion("1.18.1") + minecraftVersion("1.18.2") runDirectory(file("run/latest")) javaLauncher.set(project.javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(17)) @@ -40,7 +40,7 @@ tasks { // Setup a run task for each supported version mapOf( 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) -> for (version in minecraftVersions) { createVersionedRun(version, javaVersion) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..41d9927a4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85fd..41dfb8790 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 756d50cbf..9772e34d5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,7 @@ pluginManagement { } plugins { - id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0" + id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1" } rootProject.name = "cloud"