Bump Dokka's version with general maintenance (#40)

Kotlin · Apr 10, 2022 · bb4097f · bb4097f
1 parent e6d3231
commit bb4097f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -39,10 +39,10 @@ allprojects {
 
     tasks.withType<KotlinCompile> {
         kotlinOptions.apply {
-            languageVersion = "1.3"
+            languageVersion = "1.4"
             jvmTarget = "1.8"
-            freeCompilerArgs = freeCompilerArgs + listOf("-Xskip-runtime-version-check")
             allWarningsAsErrors = true
+            freeCompilerArgs = freeCompilerArgs + listOf("-Xsuppress-version-warnings") // suppress deprecated 1.4
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@
 version=0.3.0-SNAPSHOT
 group=org.jetbrains.kotlinx
 
-kotlinVersion=1.4.32
-dokkaVersion=1.5.0
+kotlinVersion=1.6.10
+dokkaVersion=1.6.10
 freemarkerVersion=2.3.29
 pluginPublishVersion=0.15.0
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.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/KnitApiParser.kt b/src/KnitApiParser.kt
@@ -51,7 +51,7 @@ class ApiIndex {
 
     // taking the shortest reference among candidates, prefer classes to functions
     operator fun get(name: String): String? =
-            m[name]?.minWith(apiLinkComparator)?.link
+            m[name]?.minWithOrNull(apiLinkComparator)?.link
 }
 
 private fun ApiIndex.addName(pkg: String, name: String, path: String, link: String, type: DocumentableType, namePrefix: String) {

diff --git a/test/TestDataGen.kt b/test/TestDataGen.kt
@@ -50,7 +50,7 @@ private fun writeTest(out: PrintWriter, type: TestCaseType, inPath: Path) {
     val inFileName = inPath.fileName.toString()
     assertTrue(inFileName.endsWith(type.inSuffix))
     val testPrefix = inFileName.substring(0, inFileName.length - type.inSuffix.length)
-    val testName = testPrefix.split("-").map { it.capitalize() }.joinToString("")
+    val testName = testPrefix.split("-").joinToString("") { it.capitalize() }
     val outPath = TEST_DATA_DIR.resolve(testPrefix + type.outSuffix).takeIfExists() ?: inPath
     val propsPath = TEST_DATA_DIR.resolve(testPrefix + PROPERTIES_SUFFIX).takeIfExists()
     val params = mutableListOf<Any?>(testName, inPath, outPath, propsPath)