let's try again

lavalink-devs · Apr 28, 2024 · 9b76225 · 9b76225
1 parent 7df8208
commit 9b76225
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 96 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,20 +6,26 @@ plugins {
     alias(libs.plugins.maven.publish.base) apply false
 }
 
+val (gitVersion, release) = versionFromGit()
+logger.lifecycle("Version: $gitVersion (release: $release)")
+
 allprojects {
     group = "dev.lavalink.youtube"
-    version = versionFromTag()
+    version = gitVersion
 
     repositories {
         mavenLocal()
         mavenCentral()
         maven(url = "https://maven.lavalink.dev/releases")
         maven(url = "https://jitpack.io")
     }
+}
 
-    apply(plugin = "java")
+subprojects {
+    apply<JavaPlugin>()
+    apply<MavenPublishPlugin>()
 
-    java {
+    configure<JavaPluginExtension> {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
@@ -30,44 +36,38 @@ allprojects {
         compileOnly("org.slf4j:slf4j-api:1.7.25")
         compileOnly("org.jetbrains:annotations:24.1.0")
     }
-}
 
-subprojects {
-    afterEvaluate {
-        plugins.withId(libs.plugins.maven.publish.base.get().pluginId) {
-            configure<PublishingExtension> {
-                if (findProperty("MAVEN_PASSWORD") != null && findProperty("MAVEN_USERNAME") != null) {
-                    repositories {
-                        val snapshots = "https://maven.lavalink.dev/snapshots"
-                        val releases = "https://maven.lavalink.dev/releases"
+     configure<PublishingExtension> {
+        if (findProperty("MAVEN_PASSWORD") != null && findProperty("MAVEN_USERNAME") != null) {
+            repositories {
+                val snapshots = "https://maven.lavalink.dev/snapshots"
+                val releases = "https://maven.lavalink.dev/releases"
 
-                        maven(if ((version as String).endsWith("-SNAPSHOT")) snapshots else releases) {
-                            credentials {
-                                password = findProperty("MAVEN_PASSWORD") as String?
-                                username = findProperty("MAVEN_USERNAME") as String?
-                            }
-                        }
+                maven(if (release) releases else snapshots) {
+                    credentials {
+                        password = findProperty("MAVEN_PASSWORD") as String?
+                        username = findProperty("MAVEN_USERNAME") as String?
                     }
-                } else {
-                    logger.lifecycle("Not publishing to maven.lavalink.dev because credentials are not set")
                 }
             }
+        } else {
+            logger.lifecycle("Not publishing to maven.lavalink.dev because credentials are not set")
         }
     }
 }
 
 @SuppressWarnings("GrMethodMayBeStatic")
-fun versionFromTag(): String {
+fun versionFromGit(): Pair<String, Boolean> {
     Grgit.open(mapOf("currentDir" to project.rootDir)).use { git ->
         val headTag = git.tag
             .list()
             .find { it.commit.id == git.head().id }
 
         val clean = git.status().isClean || System.getenv("CI") != null
         if (!clean) {
-            println("Git state is dirty, setting version as snapshot.")
+            logger.lifecycle("Git state is dirty, version is a snapshot.")
         }
 
-        return if (headTag != null && clean) headTag.name else "${git.head().id}-SNAPSHOT"
+        return if (headTag != null && clean) headTag.name to true else "${git.head().id}-SNAPSHOT" to false
     }
-}
+}
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -6,30 +6,14 @@ plugins {
     alias(libs.plugins.maven.publish.base)
 }
 
-val moduleName = "common"
+base {
+    archivesName = "youtube-common"
+}
 
 dependencies {
     compileOnly(libs.lavaplayer.v1)
 }
 
-tasks.jar {
-    archiveBaseName.set("youtube-common")
-}
-
-val sourcesJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("sources")
-    from(sourceSets["main"].allSource)
-}
-
 mavenPublishing {
-    configure(
-        JavaLibrary(
-            javadocJar = JavadocJar.Javadoc(),
-            sourcesJar = true
-        )
-    )
-    pom {
-        name = "Lavaplayer v1 YouTube Source"
-        description = "YouTube source for Lavaplayer v1"
-    }
+   configure(JavaLibrary(JavadocJar.Javadoc()))
 }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -1,14 +1,9 @@
-import com.vanniktech.maven.publish.JavaLibrary
-import com.vanniktech.maven.publish.JavadocJar
-
 plugins {
     `java-library`
     alias(libs.plugins.lavalink.gradle.plugin)
     alias(libs.plugins.maven.publish.base)
 }
 
-val moduleName = "plugin"
-
 lavalinkPlugin {
     name = "youtube-plugin"
     path = "dev.lavalink.youtube.plugin"
@@ -17,6 +12,10 @@ lavalinkPlugin {
     configurePublishing = false
 }
 
+base {
+    archivesName = "youtube-plugin"
+}
+
 dependencies {
     implementation(projects.common)
     implementation(projects.v2)
@@ -28,29 +27,3 @@ java {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
 }
-
-val sourcesJar by tasks.registering(Jar::class) {
-    dependsOn(tasks.generatePluginProperties)
-    archiveBaseName.set("youtube-plugin")
-    archiveClassifier.set("sources")
-    from(sourceSets["main"].allSource)
-}
-
-tasks.jar {
-    dependsOn(projects.common.dependencyProject.tasks.jar)
-    dependsOn(projects.v2.dependencyProject.tasks.jar)
-    archiveBaseName.set(moduleName)
-}
-
-mavenPublishing {
-    configure(
-        JavaLibrary(
-            javadocJar = JavadocJar.Javadoc(),
-            sourcesJar = true
-        )
-    )
-    pom {
-        name = "Lavalink YouTube Plugin"
-        description = "YouTube plugin for Lavalink"
-    }
-}
diff --git a/v2/build.gradle.kts b/v2/build.gradle.kts
@@ -6,31 +6,15 @@ plugins {
     alias(libs.plugins.maven.publish.base)
 }
 
-val moduleName = "v2"
+base {
+    archivesName = "youtube-v2"
+}
 
 dependencies {
-    compileOnly(projects.common)
+    api(projects.common)
     compileOnly(libs.lavaplayer.v2)
 }
 
-tasks.jar {
-    archiveBaseName.set("youtube-v2")
-}
-
-val sourcesJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("sources")
-    from(sourceSets["main"].allSource)
-}
-
 mavenPublishing {
-    configure(
-        JavaLibrary(
-            javadocJar = JavadocJar.Javadoc(),
-            sourcesJar = true
-        )
-    )
-    pom {
-        name = "Lavaplayer v2 YouTube Source"
-        description = "YouTube source for Lavaplayer v2"
-    }
+    configure(JavaLibrary(JavadocJar.Javadoc()))
 }