Skip to content
Closed
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
13 changes: 10 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
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.13.2"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.15.0-20240704150100-2.1-SNAPSHOT"
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
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.15.0-20240704150100-2.1-SNAPSHOT"
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.0"

Copy link
Contributor

Choose a reason for hiding this comment

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

Or we can merge #180 instead.

}

infra {
Expand All @@ -30,8 +31,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 All @@ -45,4 +52,4 @@ allprojects {

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) {}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ version=0.4
versionSuffix=SNAPSHOT

org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
kotlin_version=2.0.0-dev-16989
10 changes: 9 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
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'}
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/dev'}

Comment on lines +8 to +9
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
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/dev'}

if (kotlin_repo_url.present) {
maven { url kotlin_repo_url.get() }
}
}
}

Expand All @@ -11,4 +19,4 @@ include ':core'
project(":core").name='kotlinx-collections-immutable'

include ':benchmarks'
include ':benchmarks:runner'
include ':benchmarks:runner'