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 version to 2.0.20 #194

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ evaluationDependsOn(":kotlinx-collections-immutable")
kotlin {
infra {
target("macosX64")
target("macosArm64")
target("linuxX64")
target("mingwX64")
}
Expand Down Expand Up @@ -100,6 +101,7 @@ benchmark {
register("js")
register("wasmJs")
register("macosX64")
register("macosArm64")
register("linuxX64")
register("mingwX64")
}
Expand Down
10 changes: 8 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile

buildscript {
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.properties["kotlin_version"]}")
}
}

plugins {
id("kotlinx.team.infra") version "0.4.0-dev-80"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.2"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3"
}

infra {
Expand All @@ -30,8 +30,14 @@ apiValidation {
}

allprojects {
val kotlin_repo_url = rootProject.properties["kotlin_repo_url"]
repositories {
mavenCentral()

maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
if (kotlin_repo_url != null) {
maven(kotlin_repo_url)
}
}

tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
Expand Down
10 changes: 0 additions & 10 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,3 @@ tasks {
maxHeapSize = "1024m"
}
}

with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {
nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
}

// Drop this when node js version become stable
tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
args.add("--ignore-engines")
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import kotlinx.collections.immutable.internal.ListImplementation.checkElementInd
import kotlinx.collections.immutable.internal.ListImplementation.checkPositionIndex
import kotlinx.collections.immutable.internal.MutabilityOwnership
import kotlinx.collections.immutable.internal.assert
import kotlinx.collections.immutable.internal.modCount

internal class PersistentVectorBuilder<E>(private var vector: PersistentList<E>,
private var vectorRoot: Array<Any?>?,
Expand Down
3 changes: 0 additions & 3 deletions core/commonMain/src/internal/commonFunctions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@
package kotlinx.collections.immutable.internal

internal expect fun assert(condition: Boolean)

@Suppress("NO_ACTUAL_FOR_EXPECT") // implemented by protected property in JVM
internal expect var AbstractMutableList<*>.modCount: Int
4 changes: 0 additions & 4 deletions core/jsMain/src/internal/commonFunctions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ internal actual fun assert(condition: Boolean) {
throw AssertionError("Assertion failed")
}
}

internal actual var AbstractMutableList<*>.modCount: Int
get() = 0
set(@Suppress("UNUSED_PARAMETER") value) {}
5 changes: 0 additions & 5 deletions core/nativeMain/src/internal/commonFunctions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ package kotlinx.collections.immutable.internal

@OptIn(kotlin.experimental.ExperimentalNativeApi::class)
internal actual fun assert(condition: Boolean) = kotlin.assert(condition)


internal actual var AbstractMutableList<*>.modCount: Int
get() = 0
set(@Suppress("UNUSED_PARAMETER") value) {}
4 changes: 0 additions & 4 deletions core/wasmMain/src/internal/commonFunctions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ internal actual fun assert(condition: Boolean) {
throw AssertionError("Assertion failed")
}
}

internal actual var AbstractMutableList<*>.modCount: Int
get() = 0
set(@Suppress("UNUSED_PARAMETER") value) {}
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ group=org.jetbrains.kotlinx
version=0.4
versionSuffix=SNAPSHOT

kotlin_version=2.0.20
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
kotlin_version=2.0.20
kotlin_version=2.0.21


org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
6 changes: 6 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
pluginManagement {
def kotlin_repo_url = providers.gradleProperty("kotlin_repo_url")
repositories {
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven' }
gradlePluginPortal()

maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev'}
if (kotlin_repo_url.present) {
maven { url kotlin_repo_url.get() }
}
}
}

Expand Down