Skip to content

Commit 4035cc1

Browse files
committed
refactor: cleanup publishing logic
1 parent 81f0d7e commit 4035cc1

File tree

1 file changed

+20
-35
lines changed

1 file changed

+20
-35
lines changed

build.gradle.kts

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -157,31 +157,6 @@ tasks.withType<DokkaTask>().configureEach {
157157
}
158158
}
159159

160-
val mavenUrl: String
161-
get() {
162-
if (release) {
163-
return "https://maven.lavalink.dev/releases"
164-
}
165-
166-
return "https://maven.lavalink.dev/snapshots"
167-
}
168-
169-
publishing {
170-
repositories {
171-
maven {
172-
name = "lavalink"
173-
url = uri(mavenUrl)
174-
credentials {
175-
username = findProperty("MAVEN_USERNAME") as String?
176-
password = findProperty("MAVEN_PASSWORD") as String?
177-
}
178-
authentication {
179-
create<BasicAuthentication>("basic")
180-
}
181-
}
182-
}
183-
}
184-
185160
mavenPublishing {
186161
configure(KotlinJvm(
187162
javadocJar = JavadocJar.Dokka("dokkaJavadoc"),
@@ -191,6 +166,26 @@ mavenPublishing {
191166

192167
afterEvaluate {
193168
plugins.withId("com.vanniktech.maven.publish.base") {
169+
configure<PublishingExtension> {
170+
val mavenUsername = findProperty("MAVEN_USERNAME") as String?
171+
val mavenPassword = findProperty("MAVEN_PASSWORD") as String?
172+
if (!mavenUsername.isNullOrEmpty() && !mavenPassword.isNullOrEmpty()) {
173+
repositories {
174+
val snapshots = "https://maven.lavalink.dev/snapshots"
175+
val releases = "https://maven.lavalink.dev/releases"
176+
177+
maven(if (release) releases else snapshots) {
178+
credentials {
179+
username = mavenUsername
180+
password = mavenPassword
181+
}
182+
}
183+
}
184+
} else {
185+
logger.lifecycle("Not publishing to maven.lavalink.dev because credentials are not set")
186+
}
187+
}
188+
194189
configure<MavenPublishBaseExtension> {
195190
coordinates(group.toString(), project.the<BasePluginExtension>().archivesName.get(), version.toString())
196191
val mavenCentralUsername = findProperty("mavenCentralUsername") as String?
@@ -234,16 +229,6 @@ afterEvaluate {
234229
}
235230
}
236231

237-
val publish: Task by tasks
238-
239-
publish.apply {
240-
dependsOn(tasks.build)
241-
242-
onlyIf {
243-
findProperty("MAVEN_USERNAME") != null && findProperty("MAVEN_PASSWORD") != null
244-
}
245-
}
246-
247232
fun versionFromGit(): Pair<String, Boolean> {
248233
Grgit.open(mapOf("currentDir" to project.rootDir)).use { git ->
249234
val headTag = git.tag

0 commit comments

Comments
 (0)