Update gradle plugin and move documentation

freefair · Mar 20, 2023 · 86953b5 · 86953b5
1 parent 3c9235e
commit 86953b5
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 43 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,23 +6,17 @@ buildscript {
     }
     dependencies {
         classpath "com.gradle.publish:plugin-publish-plugin:1.1.0"
-
-        def pluginVersion = "6.6.3"
-        classpath "io.freefair.gradle:maven-plugin:$pluginVersion"
-        classpath "io.freefair.gradle:lombok-plugin:$pluginVersion"
-        classpath "io.freefair.gradle:git-plugin:$pluginVersion"
-        classpath "io.freefair.gradle:github-plugin:$pluginVersion"
     }
 }
 
 plugins {
-    id 'org.asciidoctor.jvm.convert' version '3.3.2'
+    id 'io.freefair.git-version'
+    id 'io.freefair.github.dependency-submission'
+    id 'io.freefair.maven-central.validate-poms' apply false
+    id 'io.freefair.lombok' apply false
     id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
 }
 
-apply plugin: 'io.freefair.git-version'
-apply plugin: "io.freefair.github.dependency-submission"
-
 nexusPublishing {
     repositories {
         sonatype {
@@ -149,39 +143,6 @@ allprojects {
     }
 }
 
-asciidoctor {
-    baseDirFollowsSourceDir()
-
-    attributes gradle_version: gradle.gradleVersion
-
-    inputs.dir("src/docs/asciidoc")
-}
-
-apply plugin: "io.freefair.aggregate-javadoc"
-apply plugin: "io.freefair.javadoc-links"
-
-tasks.register("docsZip", Zip) {
-    group = 'build'
-    archiveClassifier = 'docs'
-    dependsOn asciidoctor
-
-    into("api") {
-        from aggregateJavadoc
-    }
-    into("reference") {
-        from asciidoctor.outputDir
-    }
-}
-
-tasks.register("uploadDocs", io.freefair.gradle.plugins.okhttp.tasks.UploadFile) {
-    dependsOn docsZip
-    username = findProperty("freefairDocsUser")
-    password = findProperty("freefairDocsPass")
-    file = docsZip.archiveFile
-    contentType = 'application/zip'
-    url = "https://docs.freefair.io/api/$project.version?path=gradle-plugins"
-}
-
 tasks.named('wrapper') {
     distributionType = Wrapper.DistributionType.ALL
 }
diff --git a/documentation/build.gradle b/documentation/build.gradle
@@ -0,0 +1,47 @@
+plugins {
+    id 'org.asciidoctor.jvm.convert' version '3.3.2'
+    id 'io.freefair.aggregate-javadoc'
+    id 'io.freefair.javadoc-links'
+}
+
+asciidoctor {
+    baseDirFollowsSourceDir()
+
+    attributes gradle_version: gradle.gradleVersion
+
+    inputs.dir("src/docs/asciidoc")
+}
+
+dependencies {
+    rootProject.subprojects { subproject ->
+        subproject.plugins.withId("java") {
+            javadoc subproject
+        }
+    }
+
+    javadocClasspath "org.jacoco:org.jacoco.ant:${org.gradle.testing.jacoco.plugins.JacocoPlugin.DEFAULT_JACOCO_VERSION}"
+    javadocClasspath "org.apache.maven.plugins:maven-plugin-plugin:3.8.1"
+    javadocClasspath 'net.sourceforge.plantuml:plantuml:1.2023.4'
+}
+
+tasks.register("docsZip", Zip) {
+    group = 'build'
+    archiveClassifier = 'docs'
+    dependsOn asciidoctor
+
+    into("api") {
+        from javadoc
+    }
+    into("reference") {
+        from asciidoctor.outputDir
+    }
+}
+
+tasks.register("uploadDocs", io.freefair.gradle.plugins.okhttp.tasks.UploadFile) {
+    dependsOn docsZip
+    username = findProperty("freefairDocsUser")
+    password = findProperty("freefairDocsPass")
+    file = docsZip.archiveFile
+    contentType = 'application/zip'
+    url = "https://docs.freefair.io/api/$project.version?path=gradle-plugins"
+}
diff --git a/src/docs/asciidoc/_aspectj.adoc → ...mentation/src/docs/asciidoc/_aspectj.adoc b/src/docs/asciidoc/_aspectj.adoc → ...mentation/src/docs/asciidoc/_aspectj.adoc
diff --git a/src/docs/asciidoc/_compress.adoc → ...entation/src/docs/asciidoc/_compress.adoc b/src/docs/asciidoc/_compress.adoc → ...entation/src/docs/asciidoc/_compress.adoc
diff --git a/src/docs/asciidoc/_embedded-sass.adoc → ...ion/src/docs/asciidoc/_embedded-sass.adoc b/src/docs/asciidoc/_embedded-sass.adoc → ...ion/src/docs/asciidoc/_embedded-sass.adoc
diff --git a/src/docs/asciidoc/_git.adoc → documentation/src/docs/asciidoc/_git.adoc b/src/docs/asciidoc/_git.adoc → documentation/src/docs/asciidoc/_git.adoc
diff --git a/src/docs/asciidoc/_github.adoc → documentation/src/docs/asciidoc/_github.adoc b/src/docs/asciidoc/_github.adoc → documentation/src/docs/asciidoc/_github.adoc
diff --git a/src/docs/asciidoc/_jacoco.adoc → documentation/src/docs/asciidoc/_jacoco.adoc b/src/docs/asciidoc/_jacoco.adoc → documentation/src/docs/asciidoc/_jacoco.adoc
diff --git a/src/docs/asciidoc/_lombok.adoc → documentation/src/docs/asciidoc/_lombok.adoc b/src/docs/asciidoc/_lombok.adoc → documentation/src/docs/asciidoc/_lombok.adoc
diff --git a/src/docs/asciidoc/_maven-plugin.adoc → ...tion/src/docs/asciidoc/_maven-plugin.adoc b/src/docs/asciidoc/_maven-plugin.adoc → ...tion/src/docs/asciidoc/_maven-plugin.adoc
diff --git a/src/docs/asciidoc/_maven.adoc → documentation/src/docs/asciidoc/_maven.adoc b/src/docs/asciidoc/_maven.adoc → documentation/src/docs/asciidoc/_maven.adoc
diff --git a/src/docs/asciidoc/_mkdocs.adoc → documentation/src/docs/asciidoc/_mkdocs.adoc b/src/docs/asciidoc/_mkdocs.adoc → documentation/src/docs/asciidoc/_mkdocs.adoc
diff --git a/src/docs/asciidoc/_okhttp.adoc → documentation/src/docs/asciidoc/_okhttp.adoc b/src/docs/asciidoc/_okhttp.adoc → documentation/src/docs/asciidoc/_okhttp.adoc
diff --git a/src/docs/asciidoc/_plantuml.adoc → ...entation/src/docs/asciidoc/_plantuml.adoc b/src/docs/asciidoc/_plantuml.adoc → ...entation/src/docs/asciidoc/_plantuml.adoc
diff --git a/src/docs/asciidoc/index.adoc → documentation/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc → documentation/src/docs/asciidoc/index.adoc
diff --git a/settings.gradle b/settings.gradle
@@ -1,9 +1,20 @@
 import kotlin.KotlinVersion
 
 pluginManagement {
+    def freefairGradleVersion= "8.0.0-rc4"
     plugins {
+        id "io.freefair.git-version" version "$freefairGradleVersion"
+        id "io.freefair.lombok" version "$freefairGradleVersion"
+        id "io.freefair.javadocs" version "$freefairGradleVersion"
+        id "io.freefair.maven-publish-java" version "$freefairGradleVersion"
+        id "io.freefair.github.dependency-submission" version "$freefairGradleVersion"
+        id "io.freefair.maven-central.validate-poms" version "$freefairGradleVersion"
         id 'org.jetbrains.kotlin.jvm' version "${KotlinVersion.CURRENT}"
     }
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
 }
 
 plugins {
@@ -23,6 +34,7 @@ gradleEnterprise {
 rootProject.name = 'gradle-plugins'
 
 include "test-common"
+include "documentation"
 
 include "plugin-utils"