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.

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 to 2.0.0 #161

Merged
merged 4 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## [Unreleased]

## [0.7.3]
- Removed fastutil dependency

## [0.7.2]
- Fixed handling of html entities inside mathematical expressions

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=0.7.2
version=0.7.3
snapshot=true
publication_channels=maven-central-snapshot
2 changes: 1 addition & 1 deletion settings.gradle.kts
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" apply false
id("org.jetbrains.dokka") version "1.8.20" apply false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.intellij.markdown.flavours.gfm.GFMTokenTypes
import org.intellij.markdown.html.*
import org.intellij.markdown.lexer.Compat
import org.intellij.markdown.lexer.GeneratedLexer
import org.intellij.markdown.lexer.Stack

/* Auto generated File */
class _GFMLexer : GeneratedLexer {
Expand Down Expand Up @@ -56,7 +57,7 @@ class _GFMLexer : GeneratedLexer {
/* user code: */
private class Token : MarkdownTokenTypes()

private val stateStack: IntStack = IntStack()
private val stateStack: Stack<Int> = Stack()
private var isHeader = false
private var codeSpanBacktickslength = 0
private val parseDelimited = ParseDelimited()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import org.intellij.markdown.IElementType
import kotlin.Throws
import org.intellij.markdown.flavours.gfm.GFMTokenTypes
import org.intellij.markdown.html.BitSet
import org.intellij.markdown.html.IntStack
import org.intellij.markdown.lexer.Compat
import org.intellij.markdown.lexer.Stack

/**
* This class is a scanner generated by
Expand Down Expand Up @@ -61,7 +61,7 @@ class _SFMLexer : GeneratedLexer {
/* user code: */
private class Token : MarkdownTokenTypes()

private val stateStack = IntStack()
private val stateStack = Stack<Int>()
private var isHeader = false
private val parseDelimited = ParseDelimited()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ expect class BitSet(size: Int){
inline fun BitSet.clear(index: Int) =
set(index, false)

expect class IntStack() {
fun push(e: Int)
fun pop(): Int
fun isEmpty(): Boolean
}

expect fun isWhitespace(char: Char): Boolean

expect fun isPunctuation(char: Char): Boolean
Expand Down
3 changes: 0 additions & 3 deletions src/jsMain/kotlin/CommonDefsImplJs.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package org.intellij.markdown.html

import org.intellij.markdown.lexer.Stack
import org.w3c.dom.url.URL

actual class IntStack: Stack<Int>()

actual typealias BitSet = BooleanArray

actual class URI actual constructor(str: String) {
Expand Down
2 changes: 0 additions & 2 deletions src/jvmMain/kotlin/CommonDefsImplJvm.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ actual class BitSet actual constructor(size: Int): java.util.BitSet(size){
actual val size = size()
}

actual class IntStack: Stack<Int>()

private const val PUNCTUATION_MASK: Int = (1 shl Character.DASH_PUNCTUATION.toInt()) or
(1 shl Character.START_PUNCTUATION.toInt()) or
(1 shl Character.END_PUNCTUATION.toInt()) or
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
package org.intellij.markdown.html
import org.intellij.markdown.lexer.Stack

actual class IntStack: Stack<Int>()

actual typealias BitSet = BooleanArray

Expand Down
3 changes: 0 additions & 3 deletions src/wasmJsMain/kotlin/CommonDefsImplJs.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package org.intellij.markdown.html

import org.intellij.markdown.lexer.Stack
import org.w3c.dom.url.URL

actual class IntStack: Stack<Int>()

actual typealias BitSet = BooleanArray

actual class URI actual constructor(str: String) {
Expand Down
Loading