Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Dokka's version with general maintenance #40

Merged
merged 3 commits into from
Apr 10, 2022
Merged

Bump Dokka's version with general maintenance #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f6528e
Bump Dokka's version with general maintenance
IgnatBeresnev Apr 8, 2022
d6e0cf0
Downgrade language version to 1.4
IgnatBeresnev Apr 9, 2022
ac04f83
Remove unused import
IgnatBeresnev Apr 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/KnitApiParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/TestDataGen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down