From ac77c8572239a3e8a15cd758f7347648f3b8e698 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 27 Jul 2021 14:22:16 -0700
Subject: [PATCH] bukkit: Test with 1.17.1

---
 .gitignore                                | 1 -
 build-logic/src/main/kotlin/extensions.kt | 4 +++-
 examples/example-bukkit/build.gradle.kts  | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index cad6f462..740c5580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 ### Cloud ###
 
 /examples/*/run/
-/examples/*/run*/
 
 ### Eclipse ###
 .metadata
diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt
index 04729fff..b0cfb612 100644
--- a/build-logic/src/main/kotlin/extensions.kt
+++ b/build-logic/src/main/kotlin/extensions.kt
@@ -9,4 +9,6 @@ val Project.ci: Provider<Boolean>
             .orElse(false)
 
 val Project.compileExamples: Boolean
-    get() = hasProperty("compile-examples")
+    get() = providers.gradleProperty("compile-examples")
+            .forUseAtConfigurationTime()
+            .isPresent
diff --git a/examples/example-bukkit/build.gradle.kts b/examples/example-bukkit/build.gradle.kts
index 24049b2f..5d8dfd7c 100644
--- a/examples/example-bukkit/build.gradle.kts
+++ b/examples/example-bukkit/build.gradle.kts
@@ -28,7 +28,8 @@ tasks {
         dependsOn(shadowJar)
     }
     runServer {
-        minecraftVersion("1.17")
+        minecraftVersion("1.17.1")
+        runDirectory(file("run/latest"))
         javaLauncher.set(project.javaToolchains.launcherFor {
             languageVersion.set(JavaLanguageVersion.of(16))
         })
@@ -38,7 +39,7 @@ tasks {
     mapOf(
             setOf("1.8.8", "1.9.4", "1.10.2", "1.11.2", "1.12.2") to 8,
             setOf("1.13.2", "1.14.4", "1.15.2") to 11,
-            setOf("1.16.5", "1.17") to 16
+            setOf("1.16.5", "1.17.1") to 16
     ).forEach { (minecraftVersions, javaVersion) ->
         for (version in minecraftVersions) {
             createVersionedRun(version, javaVersion)
@@ -53,7 +54,7 @@ fun TaskContainerScope.createVersionedRun(
     group = "cloud"
     pluginJars.from(shadowJar.flatMap { it.archiveFile })
     minecraftVersion(version)
-    runDirectory(file("run$version"))
+    runDirectory(file("run/$version"))
     javaLauncher.set(project.javaToolchains.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(javaVersion))
     })