diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 3418e94..ab0ef39 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,9 +1,7 @@ group = "net.onelitefeather.blackhole.api" plugins { - `maven-publish` alias(libs.plugins.shadow) - alias(libs.plugins.publishdata) } dependencies { @@ -16,34 +14,3 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly(mn.junit.jupiter.engine) } - -publishData { - addBuildData() - useGitlabReposForProject("196", "https://gitlab.onelitefeather.dev/") - publishTask("shadowJar") -} - -publishing { - publications.create("maven") { - // configure the publication as defined previously. - publishData.configurePublication(this) - version = publishData.getVersion(false) - } - - repositories { - maven { - credentials(HttpHeaderCredentials::class) { - name = "Job-Token" - value = System.getenv("CI_JOB_TOKEN") - } - authentication { - create("header", HttpHeaderAuthentication::class) - } - - - name = "Gitlab" - // Get the detected repository from the publishing data - url = uri(publishData.getRepository()) - } - } -} diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index f4426f9..849ed1b 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.micronaut.application) alias(libs.plugins.micronaut.aot) + `maven-publish` } group = "net.onelitefeather.blackhole" @@ -78,3 +79,63 @@ tasks { options.forkOptions.jvmArgs = listOf("-Dmicronaut.openapi.views.spec=rapidoc.enabled=true,openapi-explorer.enabled=true,swagger-ui.enabled=true,swagger-ui.theme=flattop") } } + +publishing { + publications.create("maven") { + artifact(project.tasks.optimizedJitJar) + artifact(project.tasks.optimizedRunnerJitJar) + artifact(project.tasks.runnerJar) + artifact(project.tasks.jar) + artifact(project.tasks.optimizedDistTar) + artifact(project.tasks.optimizedDistZip) + + version = rootProject.version as String + artifactId = "blackhole-backend" + groupId = rootProject.group as String + pom { + name = "Blackhole" + description = "A backend server for managing different kind of punishments" + url = "https://github.com/OneLiteFeatherNET/Blackhole" + licenses { + license { + name = "AGPL-3.0" + url = "https://www.gnu.org/licenses/agpl-3.0.en.html" + } + } + developers { + developer { + id = "themeinerlp" + name = "Phillipp Glanz" + email = "p.glanz@madfix.me" + } + developer { + id = "theEvilReaper" + name = "Steffen Wonning" + email = "steffenwx@gmail.com" + } + } + scm { + connection = "scm:git:git://github.com:OneLiteFeatherNET/Blackhole.git" + developerConnection = "scm:git:ssh://git@github.com:OneLiteFeatherNET/Blackhole.git" + url = "https://github.com/OneLiteFeatherNET/Blackhole" + } + } + } + + repositories { + maven { + authentication { + credentials(PasswordCredentials::class) { + // Those credentials need to be set under "Settings -> Secrets -> Actions" in your repository + username = System.getenv("ONELITEFEATHER_MAVEN_USERNAME") + password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD") + } + } + + name = "OneLiteFeatherRepository" + val releasesRepoUrl = uri("https://repo.onelitefeather.dev/onelitefeather-releases") + val snapshotsRepoUrl = uri("https://repo.onelitefeather.dev/onelitefeather-snapshots") + url = if (version.toString().contains("BETA") || version.toString().contains("ALPHA") || version.toString().contains("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl + } + } +} diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 4e22c87..fbf4fe0 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -3,7 +3,6 @@ group = "net.onelitefeather.blackhole.client" plugins { `maven-publish` alias(libs.plugins.shadow) - alias(libs.plugins.publishdata) } dependencies { @@ -26,34 +25,3 @@ dependencies { testRuntimeOnly(mn.junit.jupiter.engine) testRuntimeOnly("org.junit.platform:junit-platform-launcher") } - -publishData { - addBuildData() - useGitlabReposForProject("196", "https://gitlab.onelitefeather.dev/") - publishTask("shadowJar") -} - -publishing { - publications.create("maven") { - // configure the publication as defined previously. - publishData.configurePublication(this) - version = publishData.getVersion(false) - } - - repositories { - maven { - credentials(HttpHeaderCredentials::class) { - name = "Job-Token" - value = System.getenv("CI_JOB_TOKEN") - } - authentication { - create("header", HttpHeaderAuthentication::class) - } - - - name = "Gitlab" - // Get the detected repository from the publishing data - url = uri(publishData.getRepository()) - } - } -} diff --git a/phoca/build.gradle.kts b/phoca/build.gradle.kts index 25c3ea7..aa0964f 100644 --- a/phoca/build.gradle.kts +++ b/phoca/build.gradle.kts @@ -1,7 +1,6 @@ plugins { - java - `java-library` jacoco + `java-library` `maven-publish` } @@ -40,27 +39,3 @@ tasks { } } } - - -publishing { - publications.create("maven") { - from(components["java"]) - } - - repositories { - maven { - authentication { - credentials(PasswordCredentials::class) { - username = System.getenv("ONELITEFEATHER_MAVEN_USERNAME") - password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD") - } - } - name = "OneLiteFeatherRepository" - url = if (project.version.toString().contains("SNAPSHOT")) { - uri("https://repo.onelitefeather.dev/onelitefeather-snapshots") - } else { - uri("https://repo.onelitefeather.dev/onelitefeather-releases") - } - } - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 11b85ab..2ea4661 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,11 +1,4 @@ rootProject.name = "Blackhole" -pluginManagement { - repositories { - gradlePluginPortal() - mavenCentral() - maven("https://eldonexus.de/repository/maven-public/") - } -} plugins { id("io.micronaut.platform.catalog") version "4.6.1" @@ -36,7 +29,6 @@ dependencyResolutionManagement { version("micronaut", "4.6.1") version("velocity", "3.4.0-SNAPSHOT") version("cloud.commands", "2.0.0") - version("publishdata", "1.4.0") version("shadow", "9.2.2") version("jetbrains.annotations", "26.0.2-1") @@ -49,7 +41,6 @@ dependencyResolutionManagement { plugin("micronaut.application", "io.micronaut.application").versionRef("micronaut") plugin("micronaut.aot", "io.micronaut.aot").versionRef("micronaut") - plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata") plugin("shadow", "com.gradleup.shadow").versionRef("shadow") } } diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 89cd192..ad0484f 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,13 +1,11 @@ group = "net.onelitefeather.blackhole.velocity" + plugins { id("xyz.jpenilla.run-velocity") version "3.0.2" `maven-publish` alias(libs.plugins.shadow) - alias(libs.plugins.publishdata) } - - dependencies { annotationProcessor(libs.velocity.api) @@ -32,35 +30,3 @@ tasks { velocityVersion("3.3.0-SNAPSHOT") } } - - -publishData { - addBuildData() - useGitlabReposForProject("196", "https://gitlab.onelitefeather.dev/") - publishTask("shadowJar") -} - -publishing { - publications.create("maven") { - // configure the publication as defined previously. - publishData.configurePublication(this) - version = publishData.getVersion(false) - } - - repositories { - maven { - credentials(HttpHeaderCredentials::class) { - name = "Job-Token" - value = System.getenv("CI_JOB_TOKEN") - } - authentication { - create("header", HttpHeaderAuthentication::class) - } - - - name = "Gitlab" - // Get the detected repository from the publishing data - url = uri(publishData.getRepository()) - } - } -}