diff --git a/build.gradle.kts b/build.gradle.kts index 87b120bd..0e48f0ca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,10 @@ plugins { `java-library` `maven-publish` jacoco - alias(libs.plugins.publishdata) } group = "net.theevilreaper" -version = "1.11.1" +version = "1.11.2" description = "Aves" java { @@ -60,34 +59,25 @@ tasks { } } -publishData { - addMainRepo("https://repo.onelitefeather.dev/onelitefeather-releases") - addMasterRepo("https://repo.onelitefeather.dev/onelitefeather-releases") - addSnapshotRepo("https://repo.onelitefeather.dev/onelitefeather-snapshots") - publishTask("jar") -} - publishing { - publications { - create("maven") { - // configure the publication as defined previously. - publishData.configurePublication(this) - version = publishData.getVersion(false) - } + publications.create("maven") { + from(components["java"]) } + 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" - // Get the detected repository from the publish data - url = uri(publishData.getRepository()) + 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 540e826b..37147fb0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,5 @@ rootProject.name = "aves" -pluginManagement { - repositories { - gradlePluginPortal() - maven("https://eldonexus.de/repository/maven-public/") - } -} + dependencyResolutionManagement { repositories { mavenCentral() @@ -27,7 +22,6 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { version("bom", "1.4.5") - version("publishdata", "1.4.0") library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom") library("minestom","net.minestom", "minestom").withoutVersion() library("adventure", "net.kyori", "adventure-text-minimessage").withoutVersion() @@ -35,8 +29,6 @@ dependencyResolutionManagement { library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").withoutVersion() library("junit-jupiter-engine", "org.junit.jupiter", "junit-jupiter-engine").withoutVersion() library("junit.platform.launcher", "org.junit.platform", "junit-platform-launcher").withoutVersion() - - plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata") } } }