Support for Concrete v0.15.0 that allows extended items.

This commit is contained in:
Alex Zenla 2023-03-16 17:52:08 -07:00
parent 3e50eb01a9
commit 01a520777e
Signed by: alex
GPG Key ID: C0780728420EBFE5
8 changed files with 14 additions and 67 deletions

1
.gitignore vendored
View File

@ -122,3 +122,4 @@ run/
# Foundation build # Foundation build
/.concrete-local-path /.concrete-local-path
/artifacts

View File

@ -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"
}
]
}
]
}

View File

@ -37,7 +37,7 @@ subprojects {
val paperServerVersion: String = project.properties["paperServerVersion"]?.toString() ?: "1.18" val paperServerVersion: String = project.properties["paperServerVersion"]?.toString() ?: "1.18"
concrete { concreteRoot {
minecraftServerPath.set("server") minecraftServerPath.set("server")
paperServerVersionGroup.set(paperServerVersion) paperServerVersionGroup.set(paperServerVersion)
paperApiVersion.set("1.18.2-R0.1-SNAPSHOT") paperApiVersion.set("1.18.2-R0.1-SNAPSHOT")

View File

@ -11,6 +11,6 @@ dependencies {
compileOnly(project(":foundation-shared")) compileOnly(project(":foundation-shared"))
} }
plugin { concreteItem {
dependency(project(":foundation-core")) dependency(project(":foundation-core"))
} }

View File

@ -7,6 +7,6 @@ dependencies {
compileOnly(project(":foundation-shared")) compileOnly(project(":foundation-shared"))
} }
plugin { concreteItem {
dependency(project(":foundation-core")) dependency(project(":foundation-core"))
} }

View File

@ -8,6 +8,6 @@ dependencies {
implementation(project(":common-heimdall")) implementation(project(":common-heimdall"))
} }
plugin { concreteItem {
dependency(project(":foundation-core")) dependency(project(":foundation-core"))
} }

View File

@ -40,7 +40,7 @@ dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
create("libs") { create("libs") {
version("versions-plugin", "0.45.0") 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") plugin("versions", "com.github.ben-manes.versions").versionRef("versions-plugin")

View File

@ -19,3 +19,11 @@ tasks.jar {
tasks.assemble { tasks.assemble {
dependsOn("shadowJar") dependsOn("shadowJar")
} }
concreteItem {
type.set("tool")
fileInclusion {
tasks.shadowJar.get().outputs.files.associateWith { "tool-jar" }
}
}