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

Bump korte aka korlibs-template to 4.0.10 #3205

Merged
merged 3 commits into from
Oct 17, 2023
Merged

Bump korte aka korlibs-template to 4.0.10 #3205

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ce10bb
Bump korte aka korlibs-template to 4.0.10
IgnatBeresnev Oct 11, 2023
f29b735
Merge branch 'master' into bump-korte
IgnatBeresnev Oct 16, 2023
ba1f801
Update libs.versions.toml
IgnatBeresnev Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ intellij-platform = "213.7172.25"
## HTML
jsoup = "1.15.3"
freemarker = "2.3.31"
soywiz-korte = "2.7.0"
korlibs-template = "4.0.10"
kotlinx-html = "0.7.5"

## Markdown
Expand Down Expand Up @@ -94,7 +94,10 @@ intellij-platform-util-rt = { module = "com.jetbrains.intellij.platform:util-rt"
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
freemarker = { module = "org.freemarker:freemarker", version.ref = "freemarker" }
kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinx-html" }
soywiz-korte = { module = "com.soywiz.korlibs.korte:korte-jvm", version.ref = "soywiz-korte" }

# for korlibs-template: the package was renamed and the library's source was moved, but the artifact name is still old,
# so there's a mismatch. might change in the future, follow https://github.com/korlibs/korge/issues/1836 for updates
korlibs-template = { module = "com.soywiz.korlibs.korte:korte-jvm", version.ref = "korlibs-template" }

#### Markdown ####
jetbrains-markdown = { module = "org.jetbrains:markdown", version.ref = "jetbrains-markdown" }
Expand Down
2 changes: 1 addition & 1 deletion plugins/javadoc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
implementation(projects.plugins.kotlinAsJava)

implementation(kotlin("reflect"))
implementation(libs.soywiz.korte)
implementation(libs.korlibs.template)
implementation(libs.kotlinx.html)
implementation(libs.kotlinx.coroutines.core)

Expand Down
2 changes: 1 addition & 1 deletion plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/renderer/KorteJavadocRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package org.jetbrains.dokka.javadoc.renderer

import com.soywiz.korte.*
import korlibs.template.*
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The korlibs packages were simply renamed, see korlibs/korge#1319 (comment)

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down