Listen for Java and Dokka plugin setup (#46)

bakdata · Mar 11, 2024 · 7c2fd4e · 7c2fd4e
1 parent 0ebcca8
commit 7c2fd4e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 31 deletions.
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   build-and-publish:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.42.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-plugin.yaml@1.43.0
     secrets:
       sonar-token: ${{ secrets.SONARCLOUD_TOKEN }}
       sonar-organization: ${{ secrets.SONARCLOUD_ORGANIZATION }}
@@ -19,5 +19,4 @@ jobs:
       ossrh-username: ${{ secrets.SONATYPE_OSSRH_USERNAME }}
       gradle-publish-key: ${{ secrets.GRADLE_PLUGIN_PUBLISH_KEY }}
       gradle-publish-secret: ${{ secrets.GRADLE_PLUGIN_PUBLISH_SECRET }}
-      github-username: ${{ secrets.GH_USERNAME }}
       github-token: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   java-gradle-release:
     name: Java Gradle
-    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.42.0
+    uses: bakdata/ci-templates/.github/workflows/java-gradle-release.yaml@1.43.0
     with:
       release-type: "${{ inputs.release-type }}"
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,9 @@
 plugins {
     // release
-    id("net.researchgate.release") version "3.0.2"
+    id("com.bakdata.release") version "1.3.0"
     // eat your own dog food - apply the plugins to this plugin project
     id("com.bakdata.sonar") version "1.1.17"
     id("com.bakdata.sonatype") version "1.2.2"
-    id("org.hildan.github.changelog") version "1.13.1"
     id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false
     id("com.gradle.plugin-publish") version "1.2.1" apply false
 }
@@ -38,12 +37,6 @@ configure<com.bakdata.gradle.SonatypeSettings> {
     }
 }
 
-configure<org.hildan.github.changelog.plugin.GitHubChangelogExtension> {
-    githubUser = "bakdata"
-    futureVersionTag = findProperty("changelog.releaseVersion")?.toString()
-    sinceTag = findProperty("changelog.sinceTag")?.toString()
-}
-
 subprojects {
     apply(plugin = "java")
 
@@ -88,11 +81,5 @@ subprojects {
     }
 }
 
-release {
-    git {
-        requireBranch.set("master")
-    }
-}
-
 val sonarqube by tasks
 sonarqube.enabled = false //FIXME requires Java 17
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,6 @@
 pluginManagement {
     repositories {
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-        maven { url 'https://plugins.gradle.org/m2/' }
+        gradlePluginPortal()
     }
 }
 

diff --git a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt
@@ -31,6 +31,7 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.attributes.DocsType.JAVADOC
 import org.gradle.api.logging.Logging
+import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
@@ -220,22 +221,18 @@ class SonatypePlugin : Plugin<Project> {
             apply(plugin = "signing")
             apply(plugin = "org.gradle.maven-publish")
 
-            // Java and Dokka plugins might not have been applied yet
-            project.afterEvaluate {
-                tasks.findByName("dokka")?.apply {
-                    val javadocTask: Task = this
-                    val main: SourceSet =
-                        the<JavaPluginExtension>().sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
-                    tasks.create<Jar>(main.javadocJarTaskName) {
-                        archiveClassifier.set(JAVADOC)
-                        from(javadocTask)
-                    }
-                }
-
+            project.plugins.matching { it is JavaPlugin }.all {
                 configure<JavaPluginExtension> {
                     withSourcesJar()
                     withJavadocJar()
                 }
+
+                project.tasks.matching { it.name == "dokkaJavadoc" }.all {
+                    val javadocTask: Task = this
+                    tasks.named<Jar>("javadocJar") {
+                        from(javadocTask)
+                    }
+                }
             }
 
             configure<PublishingExtension> {