Skip to content

Commit 91ffaf3

Browse files
Remove publishdata plugin usage (#45)
* Remove publishdata plugin definition and plugin portal integration * Switch from publishdata to the standard publishing style * Revert downgrade of the mycelium bom version --------- Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com>
1 parent b2dc4a2 commit 91ffaf3

2 files changed

Lines changed: 10 additions & 28 deletions

File tree

build.gradle.kts

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ plugins {
33
`java-library`
44
`maven-publish`
55
jacoco
6-
alias(libs.plugins.publishdata)
76
}
87

98
group = "net.theevilreaper"
10-
version = "1.11.1"
9+
version = "1.11.2"
1110
description = "Aves"
1211

1312
java {
@@ -60,34 +59,25 @@ tasks {
6059
}
6160
}
6261

63-
publishData {
64-
addMainRepo("https://repo.onelitefeather.dev/onelitefeather-releases")
65-
addMasterRepo("https://repo.onelitefeather.dev/onelitefeather-releases")
66-
addSnapshotRepo("https://repo.onelitefeather.dev/onelitefeather-snapshots")
67-
publishTask("jar")
68-
}
69-
7062
publishing {
71-
publications {
72-
create<MavenPublication>("maven") {
73-
// configure the publication as defined previously.
74-
publishData.configurePublication(this)
75-
version = publishData.getVersion(false)
76-
}
63+
publications.create<MavenPublication>("maven") {
64+
from(components["java"])
7765
}
66+
7867
repositories {
7968
maven {
8069
authentication {
8170
credentials(PasswordCredentials::class) {
82-
// Those credentials need to be set under "Settings -> Secrets -> Actions" in your repository
8371
username = System.getenv("ONELITEFEATHER_MAVEN_USERNAME")
8472
password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD")
8573
}
8674
}
87-
8875
name = "OneLiteFeatherRepository"
89-
// Get the detected repository from the publish data
90-
url = uri(publishData.getRepository())
76+
url = if (project.version.toString().contains("SNAPSHOT")) {
77+
uri("https://repo.onelitefeather.dev/onelitefeather-snapshots")
78+
} else {
79+
uri("https://repo.onelitefeather.dev/onelitefeather-releases")
80+
}
9181
}
9282
}
9383
}

settings.gradle.kts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
rootProject.name = "aves"
2-
pluginManagement {
3-
repositories {
4-
gradlePluginPortal()
5-
maven("https://eldonexus.de/repository/maven-public/")
6-
}
7-
}
2+
83
dependencyResolutionManagement {
94
repositories {
105
mavenCentral()
@@ -27,16 +22,13 @@ dependencyResolutionManagement {
2722
versionCatalogs {
2823
create("libs") {
2924
version("bom", "1.4.5")
30-
version("publishdata", "1.4.0")
3125
library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom")
3226
library("minestom","net.minestom", "minestom").withoutVersion()
3327
library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion()
3428
library("cyano", "net.onelitefeather", "cyano").withoutVersion()
3529
library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").withoutVersion()
3630
library("junit-jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").withoutVersion()
3731
library("junit.platform.launcher", "org.junit.platform", "junit-platform-launcher").withoutVersion()
38-
39-
plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata")
4032
}
4133
}
4234
}

0 commit comments

Comments
 (0)