Skip to content

Commit 4ea7f0d

Browse files
theEvilReapertheEvilReaper
authored
Merge pull request #20 from OneLiteFeatherNET/rework/publishing
chore: rework publishing
2 parents 380f41f + dd77fb7 commit 4ea7f0d

File tree

6 files changed

+63
-135
lines changed

6 files changed

+63
-135
lines changed

‎api/build.gradle.kts‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
group = "net.onelitefeather.blackhole.api"
22

33
plugins {
4-
`maven-publish`
54
alias(libs.plugins.shadow)
6-
alias(libs.plugins.publishdata)
75
}
86

97
dependencies {
@@ -16,34 +14,3 @@ dependencies {
1614
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
1715
testRuntimeOnly(mn.junit.jupiter.engine)
1816
}
19-
20-
publishData {
21-
addBuildData()
22-
useGitlabReposForProject("196", "https://gitlab.onelitefeather.dev/")
23-
publishTask("shadowJar")
24-
}
25-
26-
publishing {
27-
publications.create<MavenPublication>("maven") {
28-
// configure the publication as defined previously.
29-
publishData.configurePublication(this)
30-
version = publishData.getVersion(false)
31-
}
32-
33-
repositories {
34-
maven {
35-
credentials(HttpHeaderCredentials::class) {
36-
name = "Job-Token"
37-
value = System.getenv("CI_JOB_TOKEN")
38-
}
39-
authentication {
40-
create("header", HttpHeaderAuthentication::class)
41-
}
42-
43-
44-
name = "Gitlab"
45-
// Get the detected repository from the publishing data
46-
url = uri(publishData.getRepository())
47-
}
48-
}
49-
}

‎backend/build.gradle.kts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.micronaut.application)
33
alias(libs.plugins.micronaut.aot)
4+
`maven-publish`
45
}
56

67
group = "net.onelitefeather.blackhole"
@@ -78,3 +79,63 @@ tasks {
7879
options.forkOptions.jvmArgs = listOf("-Dmicronaut.openapi.views.spec=rapidoc.enabled=true,openapi-explorer.enabled=true,swagger-ui.enabled=true,swagger-ui.theme=flattop")
7980
}
8081
}
82+
83+
publishing {
84+
publications.create<MavenPublication>("maven") {
85+
artifact(project.tasks.optimizedJitJar)
86+
artifact(project.tasks.optimizedRunnerJitJar)
87+
artifact(project.tasks.runnerJar)
88+
artifact(project.tasks.jar)
89+
artifact(project.tasks.optimizedDistTar)
90+
artifact(project.tasks.optimizedDistZip)
91+
92+
version = rootProject.version as String
93+
artifactId = "blackhole-backend"
94+
groupId = rootProject.group as String
95+
pom {
96+
name = "Blackhole"
97+
description = "A backend server for managing different kind of punishments"
98+
url = "https://github.com/OneLiteFeatherNET/Blackhole"
99+
licenses {
100+
license {
101+
name = "AGPL-3.0"
102+
url = "https://www.gnu.org/licenses/agpl-3.0.en.html"
103+
}
104+
}
105+
developers {
106+
developer {
107+
id = "themeinerlp"
108+
name = "Phillipp Glanz"
109+
email = "p.glanz@madfix.me"
110+
}
111+
developer {
112+
id = "theEvilReaper"
113+
name = "Steffen Wonning"
114+
email = "steffenwx@gmail.com"
115+
}
116+
}
117+
scm {
118+
connection = "scm:git:git://github.com:OneLiteFeatherNET/Blackhole.git"
119+
developerConnection = "scm:git:ssh://git@github.com:OneLiteFeatherNET/Blackhole.git"
120+
url = "https://github.com/OneLiteFeatherNET/Blackhole"
121+
}
122+
}
123+
}
124+
125+
repositories {
126+
maven {
127+
authentication {
128+
credentials(PasswordCredentials::class) {
129+
// Those credentials need to be set under "Settings -> Secrets -> Actions" in your repository
130+
username = System.getenv("ONELITEFEATHER_MAVEN_USERNAME")
131+
password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD")
132+
}
133+
}
134+
135+
name = "OneLiteFeatherRepository"
136+
val releasesRepoUrl = uri("https://repo.onelitefeather.dev/onelitefeather-releases")
137+
val snapshotsRepoUrl = uri("https://repo.onelitefeather.dev/onelitefeather-snapshots")
138+
url = if (version.toString().contains("BETA") || version.toString().contains("ALPHA") || version.toString().contains("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
139+
}
140+
}
141+
}

‎client/build.gradle.kts‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ group = "net.onelitefeather.blackhole.client"
33
plugins {
44
`maven-publish`
55
alias(libs.plugins.shadow)
6-
alias(libs.plugins.publishdata)
76
}
87

98
dependencies {
@@ -26,34 +25,3 @@ dependencies {
2625
testRuntimeOnly(mn.junit.jupiter.engine)
2726
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
2827
}
29-
30-
publishData {
31-
addBuildData()
32-
useGitlabReposForProject("196", "https://gitlab.onelitefeather.dev/")
33-
publishTask("shadowJar")
34-
}
35-
36-
publishing {
37-
publications.create<MavenPublication>("maven") {
38-
// configure the publication as defined previously.
39-
publishData.configurePublication(this)
40-
version = publishData.getVersion(false)
41-
}
42-
43-
repositories {
44-
maven {
45-
credentials(HttpHeaderCredentials::class) {
46-
name = "Job-Token"
47-
value = System.getenv("CI_JOB_TOKEN")
48-
}
49-
authentication {
50-
create("header", HttpHeaderAuthentication::class)
51-
}
52-
53-
54-
name = "Gitlab"
55-
// Get the detected repository from the publishing data
56-
url = uri(publishData.getRepository())
57-
}
58-
}
59-
}

‎phoca/build.gradle.kts‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
2-
java
3-
`java-library`
42
jacoco
3+
`java-library`
54
`maven-publish`
65
}
76

@@ -40,27 +39,3 @@ tasks {
4039
}
4140
}
4241
}
43-
44-
45-
publishing {
46-
publications.create<MavenPublication>("maven") {
47-
from(components["java"])
48-
}
49-
50-
repositories {
51-
maven {
52-
authentication {
53-
credentials(PasswordCredentials::class) {
54-
username = System.getenv("ONELITEFEATHER_MAVEN_USERNAME")
55-
password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD")
56-
}
57-
}
58-
name = "OneLiteFeatherRepository"
59-
url = if (project.version.toString().contains("SNAPSHOT")) {
60-
uri("https://repo.onelitefeather.dev/onelitefeather-snapshots")
61-
} else {
62-
uri("https://repo.onelitefeather.dev/onelitefeather-releases")
63-
}
64-
}
65-
}
66-
}

‎settings.gradle.kts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
rootProject.name = "Blackhole"
2-
pluginManagement {
3-
repositories {
4-
gradlePluginPortal()
5-
mavenCentral()
6-
maven("https://eldonexus.de/repository/maven-public/")
7-
}
8-
}
92

103
plugins {
114
id("io.micronaut.platform.catalog") version "4.6.1"
@@ -36,7 +29,6 @@ dependencyResolutionManagement {
3629
version("micronaut", "4.6.1")
3730
version("velocity", "3.4.0-SNAPSHOT")
3831
version("cloud.commands", "2.0.0")
39-
version("publishdata", "1.4.0")
4032
version("shadow", "9.2.2")
4133
version("jetbrains.annotations", "26.0.2-1")
4234

@@ -49,7 +41,6 @@ dependencyResolutionManagement {
4941

5042
plugin("micronaut.application", "io.micronaut.application").versionRef("micronaut")
5143
plugin("micronaut.aot", "io.micronaut.aot").versionRef("micronaut")
52-
plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata")
5344
plugin("shadow", "com.gradleup.shadow").versionRef("shadow")
5445
}
5546
}

‎velocity/build.gradle.kts‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
group = "net.onelitefeather.blackhole.velocity"
2+
23
plugins {
34
id("xyz.jpenilla.run-velocity") version "3.0.2"
45
`maven-publish`
56
alias(libs.plugins.shadow)
6-
alias(libs.plugins.publishdata)
77
}
88

9-
10-
119
dependencies {
1210
annotationProcessor(libs.velocity.api)
1311

@@ -32,35 +30,3 @@ tasks {
3230
velocityVersion("3.3.0-SNAPSHOT")
3331
}
3432
}
35-
36-
37-
publishData {
38-
addBuildData()
39-
useGitlabReposForProject("196", "https://gitlab.onelitefeather.dev/")
40-
publishTask("shadowJar")
41-
}
42-
43-
publishing {
44-
publications.create<MavenPublication>("maven") {
45-
// configure the publication as defined previously.
46-
publishData.configurePublication(this)
47-
version = publishData.getVersion(false)
48-
}
49-
50-
repositories {
51-
maven {
52-
credentials(HttpHeaderCredentials::class) {
53-
name = "Job-Token"
54-
value = System.getenv("CI_JOB_TOKEN")
55-
}
56-
authentication {
57-
create("header", HttpHeaderAuthentication::class)
58-
}
59-
60-
61-
name = "Gitlab"
62-
// Get the detected repository from the publishing data
63-
url = uri(publishData.getRepository())
64-
}
65-
}
66-
}

0 commit comments

Comments
 (0)