v0.15.0

.github/workflows/portal.yml

@@ -0,0 +1,20 @@
+name: Gradle Plugin Portal
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Publish with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: "publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PLUGIN_PUBLISHING_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PLUGIN_PUBLISHING_SECRET }}"

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - main
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository

.github/workflows/qodona.yml

@@ -0,0 +1,16 @@
+name: Qodona
+on: [push]
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Qodana Scan
+        uses: JetBrains/qodana-action@main
+        env:
+          QODANA_TOKEN: "${{ secrets.QODANA_TOKEN }}"
+      - name: Upload CodeQL SARIF
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: "${{ runner.temp }}/qodana/results/qodana.sarif.json"

build.gradle.kts

@@ -1,13 +1,15 @@
+@file:Suppress("UnstableApiUsage")
 plugins {
   `kotlin-dsl`
-  kotlin("plugin.serialization") version "1.7.10"
 
   `maven-publish`
   `java-gradle-plugin`
+
+  id("com.gradle.plugin-publish") version "1.1.0"
 }
 
 group = "gay.pizza.foundation"
-version = "0.9.0"
+version = "0.15.0"
 
 repositories {
   mavenCentral()
@@ -25,29 +27,56 @@ dependencies {
 }
 
 gradlePlugin {
+  website.set("https://github.com/GayPizzaSpecifications/concrete")
+  vcsUrl.set("https://github.com/GayPizzaSpecifications/concrete")
+
   plugins {
     create("concrete-root") {
       id = "gay.pizza.foundation.concrete-root"
       implementationClass = "gay.pizza.foundation.concrete.ConcreteRootPlugin"
+
+      displayName = "Concrete Root"
+      description = "Gradle conventions for Foundation Bukkit plugins. Root project plugin."
     }
 
     create("concrete-base") {
       id = "gay.pizza.foundation.concrete-base"
       implementationClass = "gay.pizza.foundation.concrete.ConcreteBasePlugin"
+
+      displayName = "Concrete Base"
+      description = "Gradle conventions for Foundation Bukkit plugins. Base project plugin."
     }
 
     create("concrete-library") {
       id = "gay.pizza.foundation.concrete-library"
       implementationClass = "gay.pizza.foundation.concrete.ConcreteLibraryPlugin"
+
+      displayName = "Concrete Library"
+      description = "Gradle conventions for Foundation Bukkit plugins. Library project plugin."
     }
 
     create("concrete-plugin") {
       id = "gay.pizza.foundation.concrete-plugin"
       implementationClass = "gay.pizza.foundation.concrete.ConcretePluginPlugin"
+
+      displayName = "Concrete Library"
+      description = "Gradle conventions for Foundation Bukkit plugins. Plugin project plugin."
+    }
+
+    forEach { declaration ->
+      declaration.tags.set(listOf("foundation-concrete", "minecraft-bukkit"))
     }
   }
 }
 
+val gradlePublishingKey: String? = System.getenv("GRADLE_PLUGIN_PUBLISHING_KEY")
+val gradlePublishingSecret: String? = System.getenv("GRADLE_PLUGIN_PUBLISHING_SECRET")
+
+if (gradlePublishingKey != null && gradlePublishingSecret != null) {
+  project.setProperty("gradle.publish.key", gradlePublishingKey.toString())
+  project.setProperty("gradle.publish.secret", gradlePublishingSecret.toString())
+}
+
 java {
   val version = JavaVersion.toVersion("17")
   sourceCompatibility = version
@@ -99,5 +128,9 @@ publishing {
 }
 
 tasks.withType<Wrapper> {
-  gradleVersion = "7.6"
+  gradleVersion = "8.0"
+}
+
+java {
+  withSourcesJar()
 }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

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

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

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

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

samples/mixed/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

samples/mixed/gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

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,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/shared/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

samples/shared/gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

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,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

samples/simple/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

samples/simple/gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

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/ConcretePluginPlugin.kt

@@ -1,6 +1,7 @@
 package gay.pizza.foundation.concrete
 
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.get
 import org.gradle.language.jvm.tasks.ProcessResources
 
@@ -11,12 +12,16 @@ class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() {
 
     project.plugins.apply("com.github.johnrengelman.shadow")
 
-    project.tasks.find<ProcessResources>("processResources")!!.apply {
-      val props = mapOf("version" to project.version.toString())
-      inputs.properties(props)
-      filteringCharset = "UTF-8"
-      filesMatching("plugin.yml") {
-        expand(props)
+    // During IDEA project import, if this code is active, it will print warnings.
+    // This will make the VERSION field unexpanded if you run using the IntelliJ build system.
+    if (!project.properties.containsKey("idea.gradle.do.not.build.tasks")) {
+      project.tasks.find<ProcessResources>("processResources")!!.apply {
+        val props = mapOf("version" to project.version.toString())
+        inputs.properties(props)
+        filteringCharset = "UTF-8"
+        filesMatching("plugin.yml") {
+          expand(props)
+        }
       }
     }
 

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

@@ -2,9 +2,10 @@ package gay.pizza.foundation.concrete
 
 import org.gradle.api.provider.Property
 
-interface ConcreteExtension {
+interface ConcreteRootExtension {
   val paperServerVersionGroup: Property<String>
   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<ConcreteExtension>("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

@@ -0,0 +1,55 @@
+package gay.pizza.foundation.concrete
+
+/**
+ * The extensible update manifest format.
+ */
+data class ExtensibleManifest(
+  /**
+   * The items the manifest describes.
+   */
+  val items: List<ExtensibleManifestItem>
+)
+
+/**
+ * An item in the update manifest.
+ */
+data class ExtensibleManifestItem(
+  /**
+   * The name of the item.
+   */
+  val name: String,
+  /**
+   * The type of item.
+   */
+  val type: String,
+  /**
+   * The version of the item.
+   */
+  val version: String,
+  /**
+   * The dependencies of the item.
+   */
+  val dependencies: List<String>,
+  /**
+   * The files that are required to install the item.
+   */
+  val files: List<ExtensibleManifestItemFile>
+)
+
+/**
+ * A file built from the item.
+ */
+data class ExtensibleManifestItemFile(
+  /**
+   * The name of the file.
+   */
+  val name: String,
+  /**
+   * A type of file.
+   */
+  val type: String,
+  /**
+   * The relative path to download the file.
+   */
+  val path: String
+)

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

@@ -1,7 +1,9 @@
 package gay.pizza.foundation.concrete
 
 import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 
 object Globals {
-  val gson = Gson()
+  val gsonPretty: Gson = GsonBuilder().setPrettyPrinting().create()
+  val gson: Gson = Gson()
 }

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

@@ -11,7 +11,7 @@ open class RunPaperServer : RunMinecraftServer() {
 
   @Internal
   override fun getServerDirectory(): File {
-    val concrete = project.extensions.getByType<ConcreteExtension>()
+    val concrete = project.extensions.getByType<ConcreteRootExtension>()
     return project.file(concrete.minecraftServerPath.get())
   }
 

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

@@ -34,7 +34,7 @@ abstract class SetupMinecraftServer : DefaultTask() {
       Files.createSymbolicLink(pluginLinkFile.toPath(), pluginJarFile.toPath())
     }
 
-    val concrete = project.extensions.getByType<ConcreteExtension>()
+    val concrete = project.extensions.getByType<ConcreteRootExtension>()
     if (concrete.acceptServerEula.isPresent && concrete.acceptServerEula.get()) {
       val writer = minecraftServerDirectory.resolve("eula.txt").bufferedWriter()
       val properties = Properties()

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

@@ -18,7 +18,7 @@ open class SetupPaperServer : SetupMinecraftServer() {
 
   @TaskAction
   fun setupPaperServer() {
-    val concrete = project.extensions.getByType<ConcreteExtension>()
+    val concrete = project.extensions.getByType<ConcreteRootExtension>()
     val minecraftServerDirectory = getServerDirectory()
     val paperJarFile = project.file("${minecraftServerDirectory}/paper.jar")
     if (!paperJarFile.exists() || shouldUpdatePaperServer) {
@@ -50,7 +50,7 @@ open class SetupPaperServer : SetupMinecraftServer() {
 
   @Internal
   override fun getServerDirectory(): File {
-    val concrete = project.extensions.getByType<ConcreteExtension>()
+    val concrete = project.extensions.getByType<ConcreteRootExtension>()
     return project.file(concrete.minecraftServerPath.get())
   }
 }

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

@@ -4,15 +4,22 @@ 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 updateFile = manifestsDir.resolve("update.json")
-    val rootPath = project.rootProject.rootDir.toPath()
-    val updateManifest = project.findPluginProjects().mapNotNull { project ->
-      val paths = project.shadowJarOutputs!!.allFilesRelativeToPath(rootPath)
+    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!!.files.allFilesRelativeToPath(rootPath.toPath())
+
       if (paths.isNotEmpty()) {
         project.name to mapOf(
           "version" to project.version,
@@ -21,7 +28,40 @@ open class UpdateManifestTask : DefaultTask() {
       } else null
     }.toMap()
 
-    Files.writeString(updateFile, Globals.gson.toJson(updateManifest))
+    val legacyUpdateFile = manifestsDir.resolve("update.json")
+    Files.writeString(legacyUpdateFile, Globals.gson.toJson(legacyUpdateManifest))
+
+    val extensibleUpdateManifestItems = project.findItemProjects().map { project ->
+      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 }
+
+      ExtensibleManifestItem(
+        name = project.name,
+        type = concreteItemExtension.type.orNull ?: "bukkit-plugin",
+        version = concreteItemExtension.version.orNull ?: project.version.toString(),
+        dependencies = dependencies,
+        files = paths.map { (path, type) ->
+          ExtensibleManifestItemFile(
+            name = path.name,
+            type = type,
+            path = path.toPath().relativeTo(rootPath.toPath()).toUnixString()
+          )
+        }
+      )
+    }
+
+    val extensibleUpdateManifest = ExtensibleManifest(
+      items = extensibleUpdateManifestItems
+    )
+
+    val extensibleUpdateManifestFile = manifestsDir.resolve("manifest.json")
+    Files.writeString(
+      extensibleUpdateManifestFile, Globals.gsonPretty.toJson(extensibleUpdateManifest) + "\n")
   }
 
   private fun ensureManifestsDirectory(): Path {

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))
 }
@@ -30,20 +50,23 @@ internal val Project.shadowJarTask: ShadowJar?
 internal val Project.shadowJarOutputs: TaskOutputs?
   get() = shadowJarTask?.outputs
 
-internal val Project.concreteRootExtension: ConcreteExtension
+internal val Project.concreteRootExtension: ConcreteRootExtension
   get() = findTargetParent(
-    valid = { extensions.findByType(ConcreteExtension::class.java) != null },
-    extract = { extensions.findByType(ConcreteExtension::class.java)!! },
+    valid = { extensions.findByType(ConcreteRootExtension::class.java) != null },
+    extract = { extensions.findByType(ConcreteRootExtension::class.java)!! },
     error = { "Failed to find concrete root. Did you apply the concrete root plugin?" }
   )
 
+internal val Project.concreteItemExtension: ConcreteItemExtension?
+  get() = extensions.findByType(ConcreteItemExtension::class.java)
+
 /**
  * Finds the concrete root project, which is the first project in the project hierarchy
  * that has the concrete extension.
  */
 internal val Project.concreteRootProject: Project
   get() = findTargetParent(
-    valid = { extensions.findByType(ConcreteExtension::class.java) != null },
+    valid = { extensions.findByType(ConcreteRootExtension::class.java) != null },
     extract = { this },
     error = { "Failed to find concrete root. Did you apply the concrete root plugin?" }
   )
@@ -65,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

tools/ensure-new-lines.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+git ls-files -z | while IFS= read -rd '' f
+do
+  if file --mime-encoding "$f" | grep -qv binary
+  then
+    tail -c1 < "$f" | read -r _ || echo >> "$f"
+  fi
+done