v0.16.0

README.md

@@ -5,4 +5,3 @@ Concrete is a Gradle plugin for Bukkit projects. Originally spawned out of the G
 ## Contributors
 
 - [@azenla](https://github.com/azenla)
-- [@kubeliv](https://github.com/kubeliv)

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "gay.pizza.foundation"
-version = "0.12.0"
+version = "0.16.0"
 
 repositories {
   mavenCentral()
@@ -17,9 +17,9 @@ repositories {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
-  implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.10")
+  implementation("org.jetbrains.kotlin:kotlin-serialization:1.8.21")
-  implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+  implementation("com.github.johnrengelman:shadow:8.1.1")
   implementation("com.google.code.gson:gson:2.10.1")
 
   // Implementation of crypto used in smart downloader.
@@ -128,7 +128,7 @@ publishing {
 }
 
 tasks.withType<Wrapper> {
-  gradleVersion = "8.0"
+  gradleVersion = "8.1.1"
 }
 
 java {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/mixed/bukkit-plugins/build.gradle.kts

@@ -2,9 +2,10 @@ plugins {
   id("gay.pizza.foundation.concrete-root")
 }
 
-concrete {
+concreteRoot {
   minecraftServerPath.set("server")
   paperServerVersionGroup.set("1.19")
   paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")
   acceptServerEula.set(true)
+  expansiveItemInclusion.set(true)
 }

samples/mixed/bukkit-plugins/hello-world/build.gradle.kts

@@ -7,6 +7,6 @@ dependencies {
   implementation(project(":bukkit-plugins:common-library"))
 }
 
-concrete {
+concreteItem {
   dependency(project(":bukkit-plugins:goodbye-world"))
 }

samples/mixed/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/mixed/other-library/build.gradle.kts

@@ -1,3 +1,10 @@
 plugins {
   id("gay.pizza.foundation.concrete-base")
 }
+
+concreteItem {
+  type.set("library")
+  fileInclusion {
+    tasks.jar.get().outputs.files.associateWith { "library-jar" }
+  }
+}

samples/shared/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
   id("gay.pizza.foundation.concrete-plugin")
 }
 
-concrete {
+concreteRoot {
   minecraftServerPath.set("server")
   paperServerVersionGroup.set("1.19")
   paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")

samples/shared/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/simple/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   id("gay.pizza.foundation.concrete-root")
 }
 
-concrete {
+concreteRoot {
   minecraftServerPath.set("server")
   paperServerVersionGroup.set("1.19")
   paperApiVersion.set("1.19.3-R0.1-SNAPSHOT")

samples/simple/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteBasePlugin.kt

@@ -4,6 +4,7 @@ import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -40,5 +41,7 @@ open class ConcreteBasePlugin : Plugin<Project> {
         }
       }
     }
+
+    project.extensions.create<ConcreteItemExtension>("concreteItem")
   }
 }

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteItemExtension.kt

@@ -0,0 +1,21 @@
+package gay.pizza.foundation.concrete
+
+import org.gradle.api.DomainObjectSet
+import org.gradle.api.Project
+import org.gradle.api.provider.Property
+import java.io.File
+
+interface ConcreteItemExtension {
+  val type: Property<String>
+  val version: Property<String>
+  val dependencies: DomainObjectSet<Project>
+  val fileInclusion: Property<() -> Map<File, String>>
+
+  fun dependency(project: Project) {
+    dependencies.add(project)
+  }
+
+  fun fileInclusion(inclusion: () -> Map<File, String>) {
+    fileInclusion.set(inclusion)
+  }
+}

src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginExtension.kt

@@ -1,12 +0,0 @@
-package gay.pizza.foundation.concrete
-
-import org.gradle.api.DomainObjectSet
-import org.gradle.api.Project
-
-interface ConcretePluginExtension {
-  val dependencies: DomainObjectSet<Project>
-
-  fun dependency(project: Project) {
-    dependencies.add(project)
-  }
-}

src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt

@@ -9,8 +9,6 @@ class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() {
   override fun apply(project: Project) {
     super.apply(project)
 
-    project.extensions.create("concrete", ConcretePluginExtension::class.java)
-
     project.plugins.apply("com.github.johnrengelman.shadow")
 
     // During IDEA project import, if this code is active, it will print warnings.

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootExtension.kt

@@ -7,4 +7,5 @@ interface ConcreteRootExtension {
   val paperApiVersion: Property<String>
   val minecraftServerPath: Property<String>
   val acceptServerEula: Property<Boolean>
+  val expansiveItemInclusion: Property<Boolean>
 }

src/main/kotlin/gay/pizza/foundation/concrete/ConcreteRootPlugin.kt

@@ -9,7 +9,7 @@ import java.nio.file.Paths
 class ConcreteRootPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     project.apply(plugin = "base")
-    project.extensions.create<ConcreteRootExtension>("concrete")
+    project.extensions.create<ConcreteRootExtension>("concreteRoot")
     val setupPaperServer = project.tasks.create<SetupPaperServer>("setupPaperServer")
     val runPaperServer = project.tasks.create<RunPaperServer>("runPaperServer")
     runPaperServer.dependsOn(setupPaperServer)

src/main/kotlin/gay/pizza/foundation/concrete/ExtensibleManifest.kt

@@ -19,7 +19,7 @@ data class ExtensibleManifestItem(
    */
   val name: String,
   /**
-   * The type of item, for example "bukkit-plugin"
+   * The type of item.
    */
   val type: String,
   /**
@@ -33,7 +33,7 @@ data class ExtensibleManifestItem(
   /**
    * The files that are required to install the item.
    */
-  val files: List<String>
+  val files: List<ExtensibleManifestItemFile>
 )
 
 /**
@@ -45,7 +45,7 @@ data class ExtensibleManifestItemFile(
    */
   val name: String,
   /**
-   * A type of file. For example: "plugin-jar".
+   * A type of file.
    */
   val type: String,
   /**

src/main/kotlin/gay/pizza/foundation/concrete/SmartDownloader.kt

@@ -1,9 +1,13 @@
 package gay.pizza.foundation.concrete
 
 import java.net.URI
-import java.nio.file.Files
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse.BodyHandlers
 import java.nio.file.Path
 import java.security.MessageDigest
+import kotlin.io.path.exists
+import kotlin.io.path.inputStream
 
 class SmartDownloader(
   private val localFilePath: Path,
@@ -20,23 +24,25 @@ class SmartDownloader(
   }
 
   private fun downloadRemoteFile() {
-    val url = remoteDownloadUrl.toURL()
+    val httpClient = HttpClient.newHttpClient()
-    val remoteFileStream = url.openStream()
+    val request = HttpRequest.newBuilder()
-    val localFileStream = Files.newOutputStream(localFilePath)
+      .GET()
-    remoteFileStream.transferTo(localFileStream)
+      .uri(remoteDownloadUrl)
+      .build()
+    httpClient.send(request, BodyHandlers.ofFile(localFilePath))
     val hashResult = checkLocalFileHash()
     if (hashResult != HashResult.ValidHash) {
-      throw RuntimeException("Download of $remoteDownloadUrl did not result in valid hash.")
+      throw RuntimeException("Download of $remoteDownloadUrl did not result in a valid hash.")
     }
   }
 
   private fun checkLocalFileHash(): HashResult {
-    if (!Files.exists(localFilePath)) {
+    if (!localFilePath.exists()) {
       return HashResult.DoesNotExist
     }
 
     val digest = MessageDigest.getInstance("SHA-256")
-    val localFileStream = Files.newInputStream(localFilePath)
+    val localFileStream = localFilePath.inputStream()
     val buffer = ByteArray(16 * 1024)
 
     while (true) {

src/main/kotlin/gay/pizza/foundation/concrete/UpdateManifestTask.kt

@@ -4,14 +4,21 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
 import java.nio.file.Files
 import java.nio.file.Path
+import kotlin.io.path.name
+import kotlin.io.path.relativeTo
 
 open class UpdateManifestTask : DefaultTask() {
   @TaskAction
   fun update() {
     val manifestsDir = ensureManifestsDirectory()
-    val rootPath = project.projectDir.toPath()
+    val rootExtension = project.concreteRootExtension
+    val rootPath = if (rootExtension.expansiveItemInclusion.orNull == true) {
+      project.rootProject.rootDir
+    } else {
+      project.rootDir
+    }
     val legacyUpdateManifest = project.findPluginProjects().mapNotNull { project ->
-      val paths = project.shadowJarOutputs!!.allFilesRelativeToPath(rootPath)
+      val paths = project.shadowJarOutputs!!.files.allFilesRelativeToPath(rootPath.toPath())
 
       if (paths.isNotEmpty()) {
         project.name to mapOf(
@@ -24,16 +31,27 @@ open class UpdateManifestTask : DefaultTask() {
     val legacyUpdateFile = manifestsDir.resolve("update.json")
     Files.writeString(legacyUpdateFile, Globals.gson.toJson(legacyUpdateManifest))
 
-    val extensibleUpdateManifestItems = project.findPluginProjects().mapNotNull { project ->
+    val extensibleUpdateManifestItems = project.findItemProjects().map { project ->
-      val paths = project.shadowJarOutputs!!.allFilesRelativeToPath(rootPath)
+      val concreteItemExtension = project.concreteItemExtension!!
+      val pathInclusion = concreteItemExtension.fileInclusion.orNull ?: {
+        project.shadowJarOutputs!!.files.associateWith { "plugin-jar" }
+      }
+      val paths = pathInclusion()
+
+      val dependencies = concreteItemExtension.dependencies.map { it.name }
 
-      val dependencies = project.concretePluginExtension.dependencies.map { it.name }
       ExtensibleManifestItem(
         name = project.name,
-        type = "bukkit-plugin",
+        type = concreteItemExtension.type.orNull ?: "bukkit-plugin",
-        version = project.version.toString(),
+        version = concreteItemExtension.version.orNull ?: project.version.toString(),
         dependencies = dependencies,
-        files = paths.map { it.toUnixString() }
+        files = paths.map { (path, type) ->
+          ExtensibleManifestItemFile(
+            name = path.name,
+            type = type,
+            path = path.toPath().relativeTo(rootPath.toPath()).toUnixString()
+          )
+        }
       )
     }
 

src/main/kotlin/gay/pizza/foundation/concrete/extensions.kt

@@ -4,6 +4,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskContainer
 import org.gradle.api.tasks.TaskOutputs
+import java.io.File
 import java.nio.file.FileSystems
 import java.nio.file.Path
 
@@ -12,11 +13,30 @@ import java.nio.file.Path
  */
 internal fun Project.isPluginProject() = plugins.hasPlugin(ConcretePluginPlugin::class.java)
 
+/**
+ * Checks if the project has the [ConcreteBasePlugin] applied and is opting into item behavior.
+ */
+internal fun Project.isConcreteItem() =
+  isPluginProject() || concreteItemExtension?.type?.orNull != null
+
 /**
  * Finds all projects in the project's hierarchy that are plugins.
  */
 internal fun Project.findPluginProjects() = allprojects.filter { project -> project.isPluginProject() }
 
+/**
+ * Finds all projects in the project's hierarchy that are items.
+ */
+internal fun Project.findItemProjects(): List<Project> {
+  val optInExpansion = concreteRootExtension.expansiveItemInclusion.orNull ?: false
+  val searchScope = if (optInExpansion) {
+    project.rootProject.allprojects
+  } else {
+    allprojects
+  }
+  return searchScope.filter { project -> project.isConcreteItem() }
+}
+
 internal fun TaskContainer.addTaskDependency(dependent: String, dependency: String) {
   getByName(dependent).dependsOn(getByName(dependency))
 }
@@ -37,8 +57,8 @@ internal val Project.concreteRootExtension: ConcreteRootExtension
     error = { "Failed to find concrete root. Did you apply the concrete root plugin?" }
   )
 
-internal val Project.concretePluginExtension: ConcretePluginExtension
+internal val Project.concreteItemExtension: ConcreteItemExtension?
-  get() = extensions.getByType(ConcretePluginExtension::class.java)
+  get() = extensions.findByType(ConcreteItemExtension::class.java)
 
 /**
  * Finds the concrete root project, which is the first project in the project hierarchy
@@ -68,6 +88,6 @@ internal fun <T> Project.findTargetParent(valid: Project.() -> Boolean, extract:
   throw RuntimeException(error())
 }
 
-internal fun TaskOutputs.allFilesRelativeToPath(root: Path): List<Path> = files.map { root.relativize(it.toPath()) }
+internal fun Iterable<File>.allFilesRelativeToPath(root: Path): List<Path> = map { root.relativize(it.toPath()) }
 
 internal fun Path.toUnixString() = toString().replace(FileSystems.getDefault().separator, "/")

tools/build-samples.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+cd "$(dirname "${0}")/.."
+for SAMPLE_PATH in samples/*
+do
+  pushd "${SAMPLE_PATH}" > /dev/null
+  ./gradlew -q build
+  popd > /dev/null
+done