diff --git a/Jenkinsfile b/Jenkinsfile index 0f9cf367..cfaa560d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,10 @@ pipeline { post { success { archiveArtifacts artifacts: '**/build/libs/floodgate-*.jar', - excludes: '**/floodgate-parent-*.jar', + excludes: + '**/floodgate-parent-*.jar', + '**/floodgate-api-*.jar', + '**/floodgate-core-*.jar' fingerprint: true } } diff --git a/build-logic/src/main/kotlin/floodgate.database-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.database-conventions.gradle.kts index b41417e2..2012ba65 100644 --- a/build-logic/src/main/kotlin/floodgate.database-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.database-conventions.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("floodgate.publish-conventions") + id("floodgate.shadow-conventions") } tasks { diff --git a/build.gradle.kts b/build.gradle.kts index 6b08cf0b..c0652297 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,14 +12,15 @@ allprojects { description = "Allows Bedrock players to join Java edition servers while keeping the server in online mode" } -val platforms = setOf( +val deployProjects = setOf( + projects.api, + // for future Floodgate integration + Fabric + projects.core, projects.bungee, projects.spigot, projects.velocity ).map { it.dependencyProject } -projects.api.dependencyProject.plugins.apply("floodgate.publish-conventions") - //todo re-add pmd and organisation/license/sdcm/issuemanagement stuff subprojects { @@ -44,10 +45,10 @@ subprojects { if (relativePath.startsWith("database" + File.separator)) { group = rootProject.group as String + ".database" plugins.apply("floodgate.database-conventions") - } else { - when (this) { - in platforms -> plugins.apply("floodgate.publish-conventions") - else -> plugins.apply("floodgate.base-conventions") - } + } + + when (this) { + in deployProjects -> plugins.apply("floodgate.publish-conventions") + else -> plugins.apply("floodgate.base-conventions") } } \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index adafc1a6..02fec9dd 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -2,7 +2,6 @@ import net.kyori.blossom.BlossomExtension plugins { id("net.kyori.blossom") - id("floodgate.shadow-conventions") } dependencies {