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 Kotlin version to 2.0.0-RC1 #156

Closed
wants to merge 2 commits into from
Closed

Bump Kotlin version to 2.0.0-RC1 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b6f8f6
Bump Kotlin version to 2.0.0-RC1 and language version to 2.0
KvanTTT Apr 9, 2024
56b7278
Rewrite `actual IntStack` using `class` instead of `typealias`
KvanTTT Apr 9, 2024
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
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 @@ -38,8 +38,8 @@ kotlin {
targets.all {
compilations.all {
compilerOptions.configure {
languageVersion.set(KotlinVersion.KOTLIN_1_7)
apiVersion.set(KotlinVersion.KOTLIN_1_7)
languageVersion.set(KotlinVersion.KOTLIN_2_0)
apiVersion.set(KotlinVersion.KOTLIN_2_0)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include(":docs")

pluginManagement {
plugins {
kotlin("multiplatform") version "1.9.22" apply false
kotlin("multiplatform") version "2.0.0-RC1" apply false
id("org.jetbrains.dokka") version "1.8.20" apply false
}
}
12 changes: 9 additions & 3 deletions src/jvmMain/kotlin/CommonDefsImplJvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
package org.intellij.markdown.html

import it.unimi.dsi.fastutil.ints.IntArrayList
import it.unimi.dsi.fastutil.ints.IntStack
import java.net.URLEncoder
import java.util.Stack

actual class BitSet actual constructor(size: Int): java.util.BitSet(size){
actual val size = size()
}

actual typealias IntStack = IntArrayList
actual class IntStack {
private val intArrayList = IntArrayList()

actual fun push(e: Int) = intArrayList.push(e)

actual fun pop(): Int = intArrayList.popInt()

actual fun isEmpty(): Boolean = intArrayList.isEmpty
}

private const val PUNCTUATION_MASK: Int = (1 shl Character.DASH_PUNCTUATION.toInt()) or
(1 shl Character.START_PUNCTUATION.toInt()) or
Expand Down
Loading