Skip to content

Commit fbcc546

Browse files
authored
update maven publishing, gradle version & build.gradle.kts (#174)
1 parent 7e0e6f4 commit fbcc546

File tree

6 files changed

+52
-45
lines changed

6 files changed

+52
-45
lines changed

build.gradle.kts

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,34 @@ subprojects {
3737
targetCompatibility = JavaVersion.VERSION_11
3838
}
3939

40-
configure<PublishingExtension> {
41-
if (findProperty("MAVEN_PASSWORD") != null && findProperty("MAVEN_USERNAME") != null) {
42-
repositories {
43-
val snapshots = "https://maven.lavalink.dev/snapshots"
44-
val releases = "https://maven.lavalink.dev/releases"
45-
46-
maven(if (release) releases else snapshots) {
47-
credentials {
48-
password = findProperty("MAVEN_PASSWORD") as String?
49-
username = findProperty("MAVEN_USERNAME") as String?
40+
afterEvaluate {
41+
plugins.withId(libs.plugins.maven.publish.base.get().pluginId) {
42+
configure<PublishingExtension> {
43+
val mavenUsername = findProperty("MAVEN_USERNAME") as String?
44+
val mavenPassword = findProperty("MAVEN_PASSWORD") as String?
45+
if (!mavenUsername.isNullOrEmpty() && !mavenPassword.isNullOrEmpty()) {
46+
repositories {
47+
val snapshots = "https://maven.lavalink.dev/snapshots"
48+
val releases = "https://maven.lavalink.dev/releases"
49+
50+
maven(if (release) releases else snapshots) {
51+
credentials {
52+
username = mavenUsername
53+
password = mavenPassword
54+
}
55+
}
5056
}
57+
} else {
58+
logger.lifecycle("Not publishing to maven.lavalink.dev because credentials are not set")
5159
}
5260
}
53-
} else {
54-
logger.lifecycle("Not publishing to maven.lavalink.dev because credentials are not set")
55-
}
56-
}
5761

58-
afterEvaluate {
59-
plugins.withId(libs.plugins.maven.publish.base.get().pluginId) {
6062
configure<MavenPublishBaseExtension> {
6163
coordinates(group.toString(), project.the<BasePluginExtension>().archivesName.get(), version.toString())
62-
63-
if (findProperty("mavenCentralUsername") != null && findProperty("mavenCentralPassword") != null) {
64-
publishToMavenCentral(SonatypeHost.S01, false)
64+
val mavenCentralUsername = findProperty("mavenCentralUsername") as String?
65+
val mavenCentralPassword = findProperty("mavenCentralPassword") as String?
66+
if (!mavenCentralUsername.isNullOrEmpty() && !mavenCentralPassword.isNullOrEmpty()) {
67+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, false)
6568
if (release) {
6669
signAllPublications()
6770
}
@@ -100,7 +103,6 @@ subprojects {
100103
}
101104
}
102105

103-
@SuppressWarnings("GrMethodMayBeStatic")
104106
fun versionFromGit(): Pair<String, Boolean> {
105107
Grgit.open(mapOf("currentDir" to project.rootDir)).use { git ->
106108
val headTag = git.tag

gradle/wrapper/gradle-wrapper.jar

-19.2 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 14 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencyResolutionManagement {
2727
}
2828

2929
fun VersionCatalogBuilder.plugins() {
30-
val mavenPublishPlugin = version("maven-publish-plugin", "0.25.3")
30+
val mavenPublishPlugin = version("maven-publish-plugin", "0.32.0")
3131

3232
plugin("maven-publish", "com.vanniktech.maven.publish").versionRef(mavenPublishPlugin)
3333
plugin("maven-publish-base", "com.vanniktech.maven.publish.base").versionRef(mavenPublishPlugin)

0 commit comments

Comments
 (0)