bump Gradle (and Dokka)

benasher44 · Jul 21, 2023 · 06c75d1 · 06c75d1
1 parent 1b8adfd
commit 06c75d1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 68 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
     kotlin("multiplatform") version "1.9.0"
-    id("org.jetbrains.dokka") version "0.9.18"
+    id("org.jetbrains.dokka") version "1.8.20"
     id("maven-publish")
     id("signing")
 }
@@ -13,8 +13,12 @@ repositories {
     mavenCentral()
 }
 
-tasks.dokka {
-    samples = listOf("src/commonTest/kotlin")
+tasks.dokkaHtml {
+    dokkaSourceSets {
+        configureEach {
+            samples.from("src/commonTest/kotlin")
+        }
+    }
 }
 
 kotlin {
@@ -178,15 +182,15 @@ val ktlint by tasks.registering(JavaExec::class) {
     group = "verification"
     description = "Check Kotlin code style."
     classpath = ktlintConfig
-    main = "com.pinterest.ktlint.Main"
+    mainClass.set("com.pinterest.ktlint.Main")
     args = listOf("src/**/*.kt")
 }
 
 val ktlintformat by tasks.registering(JavaExec::class) {
     group = "formatting"
     description = "Fix Kotlin code style deviations."
     classpath = ktlintConfig
-    main = "com.pinterest.ktlint.Main"
+    mainClass.set("com.pinterest.ktlint.Main")
     args = listOf("-F", "src/**/*.kt", "*.kts")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -21,3 +21,5 @@ POM_DESCRIPTION=A Kotlin multiplatform implementation of a v4 RFC4122 UUID
 
 
 kotlin.mpp.enableCompatibilityMetadataVariant=true
+
+org.gradle.jvmargs=-Xmx4g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/publish.gradle b/publish.gradle
@@ -1,65 +1,6 @@
 group GROUP
 version VERSION
 
-dokka {
-  impliedPlatforms = ['Common'] // This will force platform tags for all non-common sources e.g. 'JVM'
-  kotlinTasks {
-    // dokka fails to retrieve sources from MPP-tasks so they must be set empty to avoid exception
-    // use sourceRoot instead (see below)
-    []
-  }
-  packageOptions {
-    prefix = GROUP
-  }
-  sourceRoot {
-    // assuming there is only a single source dir...
-    path = kotlin.sourceSets.commonMain.kotlin.srcDirs[0]
-    platforms = ['Common']
-  }
-  if (kotlin.sourceSets.getNames().contains('jvmMain')) {
-    sourceRoot {
-      // assuming there is only a single source dir...
-      path = kotlin.sourceSets.jvmMain.kotlin.srcDirs[0]
-      platforms = ['JVM']
-    }
-  }
-  if (kotlin.sourceSets.getNames().contains('jsMain')) {
-    sourceRoot {
-      // assuming there is only a single source dir...
-      path = kotlin.sourceSets.jsMain.kotlin.srcDirs[0]
-      platforms = ['js']
-    }
-  }
-  if (kotlin.sourceSets.getNames().contains('nativeMain')) {
-    sourceRoot {
-      // assuming there is only a single source dir...
-      path = kotlin.sourceSets.nativeMain.kotlin.srcDirs[0]
-      platforms = ['native']
-    }
-  }
-  if (kotlin.sourceSets.getNames().contains('nix32Main')) {
-    sourceRoot {
-      // assuming there is only a single source dir...
-      path = kotlin.sourceSets.nix32Main.kotlin.srcDirs[0]
-      platforms = ['native']
-    }
-  }
-  if (kotlin.sourceSets.getNames().contains('nix64Main')) {
-    sourceRoot {
-      // assuming there is only a single source dir...
-      path = kotlin.sourceSets.nix64Main.kotlin.srcDirs[0]
-      platforms = ['native']
-    }
-  }
-  if (kotlin.sourceSets.getNames().contains('mingwMain')) {
-    sourceRoot {
-      // assuming there is only a single source dir...
-      path = kotlin.sourceSets.mingwMain.kotlin.srcDirs[0]
-      platforms = ['native']
-    }
-  }
-}
-
 def isReleaseBuild() {
   return VERSION.contains('SNAPSHOT') == false
 }
@@ -82,9 +23,9 @@ def getRepositoryPassword() {
   return System.getenv('SONATYPE_PASSWORD') ?: ''
 }
 
-task javadocsJar(type: Jar, dependsOn: dokka) {
-  classifier = 'javadoc'
-  from dokka.outputDirectory
+task javadocsJar(type: Jar, dependsOn: dokkaHtml) {
+  archiveClassifier = 'javadoc'
+  from dokkaHtml.outputDirectory
 }
 
 publishing {