Publishing changes

This commit is contained in:
RednedEpic 2022-04-24 13:16:39 -05:00
parent 3889110081
commit 463fc83f78
7 changed files with 43 additions and 28 deletions

10
Jenkinsfile vendored
View file

@ -11,7 +11,12 @@ pipeline {
stage ('Build') { stage ('Build') {
steps { steps {
sh 'git submodule update --init --recursive' sh 'git submodule update --init --recursive'
sh './gradlew clean build' rtGradleRun(
usesPlugin: true,
tool: 'Gradle 7',
buildFile: 'build.gradle.kts',
tasks: 'clean build',
)
} }
post { post {
success { success {
@ -40,9 +45,10 @@ pipeline {
serverId: "opencollab-artifactory" serverId: "opencollab-artifactory"
) )
rtGradleRun( rtGradleRun(
usesPlugin: false, usesPlugin: true,
tool: 'Gradle 7', tool: 'Gradle 7',
rootDir: "", rootDir: "",
useWrapper: true,
buildFile: 'build.gradle.kts', buildFile: 'build.gradle.kts',
tasks: 'build artifactoryPublish', tasks: 'build artifactoryPublish',
deployerId: "GRADLE_DEPLOYER", deployerId: "GRADLE_DEPLOYER",

View file

@ -1,5 +1,5 @@
plugins { plugins {
id("geyser.shadow-conventions") id("geyser.api-conventions")
} }
tasks { tasks {

View file

@ -1,4 +1,4 @@
plugins { plugins {
application application
id("geyser.shadow-conventions") id("geyser.publish-conventions")
} }

View file

@ -0,0 +1,31 @@
plugins {
id("geyser.shadow-conventions")
id("com.jfrog.artifactory")
id("maven-publish")
}
publishing {
publications.create<MavenPublication>("mavenJava") {
groupId = project.group as String
artifactId = "Geyser-" + project.name
version = project.version as String
artifact(tasks["shadowJar"])
artifact(tasks["sourcesJar"])
}
}
artifactory {
publish {
repository {
setRepoKey(if (isSnapshot()) "maven-snapshots" else "maven-releases")
setMavenCompatible(true)
}
defaults {
publishConfigs("archives")
setPublishArtifacts(true)
setPublishPom(true)
setPublishIvy(false)
}
}
}

View file

@ -3,7 +3,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins { plugins {
id("geyser.base-conventions") id("geyser.base-conventions")
id("com.github.johnrengelman.shadow") id("com.github.johnrengelman.shadow")
id("com.jfrog.artifactory")
} }
tasks { tasks {
@ -31,25 +30,3 @@ tasks {
dependsOn(shadowJar) dependsOn(shadowJar)
} }
} }
publishing {
publications.named<MavenPublication>("mavenJava") {
artifact(tasks["shadowJar"])
artifact(tasks["sourcesJar"])
}
}
artifactory {
publish {
repository {
setRepoKey("maven-snapshots")
setMavenCompatible(true)
}
defaults {
publishConfigs("archives")
setPublishArtifacts(true)
setPublishPom(true)
setPublishIvy(false)
}
}
}

View file

@ -41,7 +41,7 @@ subprojects {
group = rootProject.group as String + ".geyser" group = rootProject.group as String + ".geyser"
when (this) { when (this) {
in platforms -> plugins.apply("geyser.platform-conventions") in platforms -> plugins.apply("geyser.platform-conventions")
api -> plugins.apply("geyser.shadow-conventions") api -> plugins.apply("geyser.publish-conventions")
else -> plugins.apply("geyser.base-conventions") else -> plugins.apply("geyser.base-conventions")
} }
} }

View file

@ -4,6 +4,7 @@ import net.kyori.blossom.BlossomExtension
plugins { plugins {
id("net.kyori.blossom") id("net.kyori.blossom")
id("net.kyori.indra.git") id("net.kyori.indra.git")
id("geyser.shadow-conventions")
} }
dependencies { dependencies {