diff --git a/.gitignore b/.gitignore index f9703ab..d16946b 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ run/ # Foundation build /.concrete-local-path +/artifacts diff --git a/artifacts/manifest.json b/artifacts/manifest.json deleted file mode 100644 index 4f4afc2..0000000 --- a/artifacts/manifest.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "items": [ - { - "name": "foundation-bifrost", - "type": "bukkit-plugin", - "version": "DEV", - "dependencies": [ - "foundation-core" - ], - "files": [ - { - "name": "foundation-bifrost-DEV-plugin.jar", - "type": "plugin-jar", - "path": "foundation-bifrost/build/libs/foundation-bifrost-DEV-plugin.jar" - } - ] - }, - { - "name": "foundation-chaos", - "type": "bukkit-plugin", - "version": "DEV", - "dependencies": [ - "foundation-core" - ], - "files": [ - { - "name": "foundation-chaos-DEV-plugin.jar", - "type": "plugin-jar", - "path": "foundation-chaos/build/libs/foundation-chaos-DEV-plugin.jar" - } - ] - }, - { - "name": "foundation-core", - "type": "bukkit-plugin", - "version": "DEV", - "dependencies": [], - "files": [ - { - "name": "foundation-core-DEV-plugin.jar", - "type": "plugin-jar", - "path": "foundation-core/build/libs/foundation-core-DEV-plugin.jar" - } - ] - }, - { - "name": "foundation-heimdall", - "type": "bukkit-plugin", - "version": "DEV", - "dependencies": [ - "foundation-core" - ], - "files": [ - { - "name": "foundation-heimdall-DEV-plugin.jar", - "type": "plugin-jar", - "path": "foundation-heimdall/build/libs/foundation-heimdall-DEV-plugin.jar" - } - ] - } - ] -} diff --git a/build.gradle.kts b/build.gradle.kts index 0b0dd50..eb52380 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ subprojects { val paperServerVersion: String = project.properties["paperServerVersion"]?.toString() ?: "1.18" -concrete { +concreteRoot { minecraftServerPath.set("server") paperServerVersionGroup.set(paperServerVersion) paperApiVersion.set("1.18.2-R0.1-SNAPSHOT") diff --git a/foundation-bifrost/build.gradle.kts b/foundation-bifrost/build.gradle.kts index 2664b90..d75e00c 100644 --- a/foundation-bifrost/build.gradle.kts +++ b/foundation-bifrost/build.gradle.kts @@ -11,6 +11,6 @@ dependencies { compileOnly(project(":foundation-shared")) } -plugin { +concreteItem { dependency(project(":foundation-core")) } diff --git a/foundation-chaos/build.gradle.kts b/foundation-chaos/build.gradle.kts index 025ca99..7a4a0df 100644 --- a/foundation-chaos/build.gradle.kts +++ b/foundation-chaos/build.gradle.kts @@ -7,6 +7,6 @@ dependencies { compileOnly(project(":foundation-shared")) } -plugin { +concreteItem { dependency(project(":foundation-core")) } diff --git a/foundation-heimdall/build.gradle.kts b/foundation-heimdall/build.gradle.kts index 4b5ddde..9ffc299 100644 --- a/foundation-heimdall/build.gradle.kts +++ b/foundation-heimdall/build.gradle.kts @@ -8,6 +8,6 @@ dependencies { implementation(project(":common-heimdall")) } -plugin { +concreteItem { dependency(project(":foundation-core")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 038ea6d..9f246e5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -40,7 +40,7 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { version("versions-plugin", "0.45.0") - version("concrete", "0.14.0") + version("concrete", "0.15.0") plugin("versions", "com.github.ben-manes.versions").versionRef("versions-plugin") diff --git a/tool-gjallarhorn/build.gradle.kts b/tool-gjallarhorn/build.gradle.kts index bb1789e..277435b 100644 --- a/tool-gjallarhorn/build.gradle.kts +++ b/tool-gjallarhorn/build.gradle.kts @@ -19,3 +19,11 @@ tasks.jar { tasks.assemble { dependsOn("shadowJar") } + +concreteItem { + type.set("tool") + + fileInclusion { + tasks.shadowJar.get().outputs.files.associateWith { "tool-jar" } + } +}