diff --git a/Jenkinsfile b/Jenkinsfile index 46351173..817517d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { } post { success { - archiveArtifacts artifacts: '**/build/libs/floodgate-*.jar', excludes: "**/build/libs/floodgate-api.jar,**/build/libs/floodgate-core.jar", fingerprint: true + archiveArtifacts artifacts: '**/build/libs/floodgate-*.jar', fingerprint: true } } } diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt index f1a05160..fa5eeb31 100644 --- a/build-logic/src/main/kotlin/extensions.kt +++ b/build-logic/src/main/kotlin/extensions.kt @@ -30,6 +30,9 @@ import org.gradle.api.artifacts.ProjectDependency import org.gradle.kotlin.dsl.named import org.gradle.kotlin.dsl.the +fun Project.isSnapshot(): Boolean = + version.toString().endsWith("-SNAPSHOT") + fun Project.fullVersion(): String { var version = version.toString() if (version.endsWith("-SNAPSHOT")) { diff --git a/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts index 5ba172b0..0dba1832 100644 --- a/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts @@ -32,12 +32,4 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 withSourcesJar() -} - -publishing { - publications.create("mavenJava") { - groupId = project.group as String - artifactId = "floodgate-" + project.name - version = project.version as String - } } \ No newline at end of file diff --git a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts index 5c7d4a1f..0a0b9b28 100644 --- a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts @@ -33,7 +33,11 @@ tasks { } publishing { - publications.named("mavenJava") { + publications.create("mavenJava") { + groupId = project.group as String + artifactId = "floodgate-" + project.name + version = project.version as String + artifact(tasks["shadowJar"]) artifact(tasks["sourcesJar"]) } @@ -42,7 +46,7 @@ publishing { artifactory { publish { repository { - setRepoKey("maven-snapshots") + setRepoKey(if (isSnapshot()) "maven-snapshots" else "maven-releases") setMavenCompatible(true) } defaults {