Upgrade publishing script

xgouchet · May 5, 2022 · db327a6 · db327a6
1 parent 9ad35c1
commit db327a6
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 25 deletions.
diff --git a/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/plugin/GithubWikiPlugin.kt b/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/plugin/GithubWikiPlugin.kt
@@ -21,7 +21,7 @@ class GithubWikiPlugin : Plugin<Project> {
             buildTask.setCombinedTypes(extension.types)
         }
 
-        target.tasks.named("dokka") {
+        target.tasks.named("dokkaGfm") {
             buildTask.dependsOn(this)
         }
     }

diff --git a/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/plugin/GithubWikiTask.kt b/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/plugin/GithubWikiTask.kt
@@ -34,7 +34,8 @@ open class GithubWikiTask : DefaultTask() {
 
     @InputDirectory
     internal fun getInputDir(): File {
-        return File(projectDokkaDir, projectName)
+        val gfmDir = File(projectDokkaDir, "gfm")
+        return File(gfmDir, projectName)
     }
 
     @OutputDirectory

diff --git a/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/settings/CommonConfig.kt b/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/settings/CommonConfig.kt
@@ -8,4 +8,5 @@ fun Project.commonConfig() {
     junitConfig()
     ktLintConfig()
     dokkaConfig()
+    mavenConfig()
 }
diff --git a/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/settings/DokkaConfig.kt b/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/settings/DokkaConfig.kt
@@ -2,26 +2,14 @@ package fr.xgouchet.buildsrc.settings
 
 import org.gradle.api.Project
 import org.gradle.jvm.tasks.Jar
-import org.jetbrains.dokka.gradle.DokkaTask
 
 @Suppress("UnstableApiUsage")
 fun Project.dokkaConfig() {
 
-    tasks.register("generateJavadoc", Jar::class.java) {
-        dependsOn(":dd-sdk-android:dokka")
+    project.tasks.register("generateJavadoc", Jar::class.java) {
+        group = "publishing"
+        dependsOn("dokkaJavadoc")
         archiveClassifier.convention("javadoc")
         from("${buildDir.canonicalPath}/reports/javadoc")
     }
-
-    tasks.withType(DokkaTask::class.java) {
-        outputFormat = "gfm"
-//        configuration {
-//            includeNonPublic = false
-//            skipDeprecated = false
-//            reportUndocumented = true
-//            skipEmptyPackages = true
-//            // targets = listOf("JVM")
-//        }
-//        outputDirectory = "${rootDir.path}/../Elmyr.wiki/"
-    }
 }
diff --git a/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/settings/MavenConfig.kt b/buildSrc/src/main/kotlin/fr/xgouchet/buildsrc/settings/MavenConfig.kt
@@ -0,0 +1,19 @@
+package fr.xgouchet.buildsrc.settings
+
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.get
+
+fun Project.mavenConfig() {
+    extensionConfig<PublishingExtension> {
+        publications.create("maven", MavenPublication::class.java) {
+            groupId = "com.github.xgouchet"
+            artifactId = project.name
+            version = "1.3.4"
+            from(components["kotlin"])
+            artifact(tasks.findByName("kotlinSourcesJar"))
+            artifact(tasks.findByName("generateJavadoc"))
+        }
+    }
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jetbrains.dokka")
     id("githubWiki")
-//    maven
+    `maven-publish`
 }
 
 dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ mockitoJunit5 = "4.2.0"
 
 detekt = "1.19.0"
 depsVersion = "0.41.0"
-dokka = "0.10.1"
+dokka = "1.6.21"
 ktlint = "9.1.0"
 
 [libraries]

diff --git a/inject/build.gradle.kts b/inject/build.gradle.kts
@@ -5,7 +5,8 @@ plugins {
     id("com.github.ben-manes.versions")
     id("io.gitlab.arturbosch.detekt")
     id("org.jlleitschuh.gradle.ktlint")
-//    maven
+    id("org.jetbrains.dokka")
+    `maven-publish`
 }
 
 dependencies {

diff --git a/junit4/build.gradle.kts b/junit4/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jetbrains.dokka")
     id("githubWiki")
-//    maven
+    `maven-publish`
 }
 
 dependencies {

diff --git a/junit5/build.gradle.kts b/junit5/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jetbrains.dokka")
     id("githubWiki")
-//    maven
+    `maven-publish`
 }
 
 dependencies {

diff --git a/jvm/build.gradle.kts b/jvm/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("io.gitlab.arturbosch.detekt")
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jetbrains.dokka")
-//    maven
+    `maven-publish`
 }
 
 dependencies {

diff --git a/semantics/build.gradle.kts b/semantics/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("io.gitlab.arturbosch.detekt")
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jetbrains.dokka")
-//    maven
+    `maven-publish`
 }
 
 dependencies {

diff --git a/spek/build.gradle.kts b/spek/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jetbrains.dokka")
     id("githubWiki")
-//    maven
+    `maven-publish`
 }
 
 dependencies {