Skip to content

Version 1.8.0-RC #3965

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

Merged
merged 62 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
bc35cd8
Update Kotlin to 1.9.0 (#3814)
qwwdfsad Jul 26, 2023
bb54504
Fix typo in CommunityProjectsBuild.kt build script (#3829)
nodmp Jul 27, 2023
e0dd277
Conditionally remove native targets that are removed in 1.9.20 (#3825)
mvicsokolova Jul 28, 2023
6fb30e2
Add optins required in Kotlin 1.9
demiurg906 Jan 26, 2023
77b630c
Migrate from the deprecated native atomics
mvicsokolova Jun 29, 2023
bb21e8e
Ignore adding additional optIns also for "jvmCoreMain" source set
Tapchicoma Jul 28, 2023
a1134f2
Revert "Add optins required in Kotlin 1.9"
mvicsokolova Jul 29, 2023
1a09305
Merge pull request #3830 from Kotlin/yahor/fix-optin-inconsistency
woainikk Jul 31, 2023
1781a1e
Add Optin for kotlinx.cinterop.UnsafeNumber due to KT-59859
woainikk Jul 31, 2023
a4ddb92
Merge pull request #3831 from Kotlin/bobova/addOptIn
woainikk Aug 3, 2023
db57e08
Fix NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS compilation error (#3826)
nikitabobko Aug 9, 2023
7ef545e
Merge pull request #3798 from Kotlin/update-native-atomics
woainikk Aug 14, 2023
9942a30
Fix expect/actual mismatched member scope for `open expect` compilati…
nikitabobko Aug 11, 2023
203ab5b
Explain potential memory leak that nulling BufferedChannelIterator.co…
qwwdfsad Aug 14, 2023
e1a0b5d
Update atomicfu to 0.22.0 (#3848)
mvicsokolova Aug 14, 2023
c9d8857
Merge pull request #3847 from Kotlin/bobko/MR/expect-open-class-misma…
woainikk Aug 16, 2023
b9ff218
Fix NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS compilation error #2 (#…
nikitabobko Aug 17, 2023
5ac6472
Fix NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS compilation error
woainikk Aug 18, 2023
782e22b
Merge pull request #3855 from Kotlin/bobova/fixforKT-59665
woainikk Aug 21, 2023
aa6b74e
Removing unused imports in build.gradle (#3860)
mjovanc Aug 28, 2023
2d64ba1
Kotlin 1.9.20 migration: Fix NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLAS…
woainikk Aug 31, 2023
4673870
Mute "expect/actual classes are experimental" warning
nikitabobko Aug 31, 2023
9d1c62a
Get rid of ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS to reduce the tensi…
qwwdfsad Sep 1, 2023
454acd8
Kotlin 1.9.20 migration: Fix ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAME_MEM…
woainikk Aug 31, 2023
56b9af2
Merge pull request #3876 from Kotlin/bobova/supressKT-22841
woainikk Sep 4, 2023
748ace5
Merge pull request #3872 from Kotlin/bobko/MR/expect-actual-class-war…
woainikk Sep 4, 2023
fd5a58b
Document that SharedFlow.collect subscribes by its first suspension (…
dkhalanskyjb Sep 14, 2023
84a2cba
Minor: add forgotten Suppress for ACTUAL_CLASSIFIER_MUST_HAVE_THE_SAM…
dsavvinov Sep 19, 2023
7659d65
Introduce workaround (in fact, fix the previously incorrect expect-ac…
qwwdfsad Sep 20, 2023
64d8874
"member scope mismatch for open expect" was downgraded from error to …
nikitabobko Oct 5, 2023
1fc8c37
Add java.base/sun.security.action required for Lincheck to run on Jav…
qwwdfsad Oct 6, 2023
26085d7
Merge pull request #3906 from Kotlin/bobko/MR/error-to-warning
woainikk Oct 6, 2023
44d46ea
Ensure `runTest` unsubscribes from the exception handler (#3909)
dkhalanskyjb Oct 23, 2023
2b5d93f
Introduce the notion of @BeningDataRace (#3873)
qwwdfsad Oct 23, 2023
5a570e1
Work around KT-58685 (#3881)
CLOVIS-AI Nov 2, 2023
b2ef7ab
Update Kotlin to 1.9.20 (#3925)
qwwdfsad Nov 6, 2023
e69bc2c
Kotlin 1.9.20 update followup (#3926)
qwwdfsad Nov 6, 2023
3dd48ac
Specify that `subscriptionCount` not conflating is a guarantee (#3934)
dkhalanskyjb Nov 8, 2023
ff95ab7
Properly round `Duration` instances to milliseconds (#3921)
kevincianfarini Nov 15, 2023
142f797
Introduce jvmBenchmarks into kotlinx-coroutines-core (#3946)
qwwdfsad Nov 21, 2023
9e0cfe0
Remove memoryModel = experimental (#3947)
qwwdfsad Nov 21, 2023
d559909
Rename the `completion` field in `SafeCollector`
dkhalanskyjb Jun 29, 2023
2d852a5
Make SchedulerTask a proper interface
dkhalanskyjb Jun 29, 2023
2ec8c28
Add INVISIBLE_REFERENCE to every INVISIBLE_MEMBER suppression
dkhalanskyjb Nov 24, 2023
9b2bd3a
Work around KT-63238 by removing Any.unwrap altogether
dkhalanskyjb Nov 15, 2023
e1342d2
Update Kotlin to 1.9.21 (#3954)
qwwdfsad Nov 27, 2023
f5b3f96
Ensure that `println` is properly resolved in the JVM tests (#3955)
dkhalanskyjb Nov 28, 2023
2d0bb86
Suppress MULTIPLE_DEFAULTS_INHERITED_FROM_SUPERTYPES warnings (#3896)
lunakoly Sep 21, 2023
aa5d0ce
Fix KT-62279 by suppressing `INVISIBLE_SETTER`
dkhalanskyjb Nov 8, 2023
addb524
Work around KT-60304 by suppressing "INVISIBLE_SETTER"
dkhalanskyjb Jul 19, 2023
d5c0eff
Fix warnings in Native (#3957)
dkhalanskyjb Nov 30, 2023
9a98eab
Rollback runTest timeout to 60 seconds, configure it with getenv (#3945)
dkhalanskyjb Nov 30, 2023
00a0767
Explain SafeCollector hackery (#3811)
qwwdfsad Nov 30, 2023
a79db37
Create Dispatcher.Default threads with the same context classloader a…
qwwdfsad Nov 30, 2023
5cd845b
Fix warnings that manifested themselves as errors after multiple simu…
qwwdfsad Nov 30, 2023
3ceb35d
Fix kotlinx-coroutines-debug having the wrong module-info (#3948)
dkhalanskyjb Dec 1, 2023
7f32340
Ensure Dispatchers.Main != Dispatchers.Main.immediate on Android (#3924)
dkhalanskyjb Dec 1, 2023
17bdf4a
Remove metaInfo usage (#3964)
ilgonmic Dec 1, 2023
85afa72
WASM target implementation (#3849)
igoriakovlev Dec 1, 2023
2cea84c
Merge remote-tracking branch 'origin/master' into develop
dkhalanskyjb Dec 1, 2023
c39f92f
Make the benchmark instructions version-independent
dkhalanskyjb Dec 1, 2023
69dc487
Version 1.8.0-RC
dkhalanskyjb Dec 1, 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
15 changes: 15 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Change log for kotlinx.coroutines

## Version 1.8.0-RC

* Implement the library for the Web Assembly (Wasm) for JavaScript (#3713). Thanks @igoriakovlev!
* On Android, ensure that `Dispatchers.Main != Dispatchers.Main.immediate` (#3545, #3963).
* `kotlinx-coroutines-debug` is published with the incorrect Java 9 module info (#3944).
* Major Kotlin version update: was 1.8.20, became 1.9.21.
* `kotlinx-coroutines-test`: set the default timeout of `runTest` to 60 seconds, added the ability to configure it on the JVM with the `kotlinx.coroutines.test.default_timeout=10s` (#3800).
* `kotlinx-coroutines-test`: fixed a bug that could lead to not all uncaught exceptions being reported after some tests failed (#3800).
* `delay(Duration)` rounds nanoseconds up to whole milliseconds and not down (#3920). Thanks @kevincianfarini!
* `Dispatchers.Default` and the default thread for background work are guaranteed to use the same context classloader as the object containing it them (#3832).
* It is guaranteed that by the time `SharedFlow.collect` suspends for the first time, it's registered as a subscriber for that `SharedFlow` (#3885). Before, it was also true, but not documented.
* Atomicfu version is updated to 0.23.1, and Kotlin/Native atomic transformations are enabled, reducing the footprint of coroutine-heavy code (#3954).
* Added a workaround for miscompilation of `withLock` on JS (#3881). Thanks @CLOVIS-AI!
* Small tweaks and documentation fixes.

## Version 1.7.3

* Disabled the publication of the multiplatform library metadata for the old (1.6 and earlier) KMP Gradle plugin (#3809).
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
[![Kotlin Stable](https://kotl.in/badges/stable.svg)](https://kotlinlang.org/docs/components-stability.html)
[![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
[![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.7.3)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.7.3)
[![Kotlin](https://img.shields.io/badge/kotlin-1.8.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.8.0-RC)](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.8.0-RC)
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)

Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
This is a companion version for the Kotlin `1.8.20` release.
This is a companion version for the Kotlin `1.9.21` release.

```kotlin
suspend fun main() = coroutineScope {
Expand Down Expand Up @@ -85,15 +85,15 @@ Add dependencies (you can also add other modules that you need):
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
<version>1.7.3</version>
<version>1.8.0-RC</version>
</dependency>
```

And make sure that you use the latest Kotlin version:

```xml
<properties>
<kotlin.version>1.8.20</kotlin.version>
<kotlin.version>1.9.21</kotlin.version>
</properties>
```

Expand All @@ -103,7 +103,7 @@ Add dependencies (you can also add other modules that you need):

```kotlin
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
}
```

Expand All @@ -112,10 +112,10 @@ And make sure that you use the latest Kotlin version:
```kotlin
plugins {
// For build.gradle.kts (Kotlin DSL)
kotlin("jvm") version "1.8.20"
kotlin("jvm") version "1.9.21"

// For build.gradle (Groovy DSL)
id "org.jetbrains.kotlin.jvm" version "1.8.20"
id "org.jetbrains.kotlin.jvm" version "1.9.21"
}
```

Expand All @@ -133,7 +133,7 @@ Add [`kotlinx-coroutines-android`](ui/kotlinx-coroutines-android)
module as a dependency when using `kotlinx.coroutines` on Android:

```kotlin
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
```

This gives you access to the Android [Dispatchers.Main]
Expand Down Expand Up @@ -168,7 +168,7 @@ In common code that should get compiled for different platforms, you can add a d
```kotlin
commonMain {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
}
}
```
Expand All @@ -180,7 +180,7 @@ Platform-specific dependencies are recommended to be used only for non-multiplat
#### JS

Kotlin/JS version of `kotlinx.coroutines` is published as
[`kotlinx-coroutines-core-js`](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core-js/1.7.3)
[`kotlinx-coroutines-core-js`](https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core-js/1.8.0-RC)
(follow the link to get the dependency declaration snippet) and as [`kotlinx-coroutines-core`](https://www.npmjs.com/package/kotlinx-coroutines-core) NPM package.

#### Native
Expand Down Expand Up @@ -215,7 +215,7 @@ See [Contributing Guidelines](CONTRIBUTING.md).
[Dispatchers.IO]: https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/-i-o.html
[asCoroutineDispatcher]: https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/as-coroutine-dispatcher.html
[Promise.await]: https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/await.html
[promise]: https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/promise.html
[promise]: https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/[js]promise.html
[Window.asCoroutineDispatcher]: https://kotlinlang.org/api/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines/as-coroutine-dispatcher.html

<!--- INDEX kotlinx.coroutines.flow -->
Expand Down
60 changes: 21 additions & 39 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.dokka.gradle.DokkaTaskPartial
Expand Down Expand Up @@ -63,7 +61,6 @@ buildscript {
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
classpath "com.github.node-gradle:gradle-node-plugin:$gradle_node_version"
classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$binary_compatibility_validator_version"
classpath "ru.vyarus:gradle-animalsniffer-plugin:1.5.4" // Android API check
classpath "org.jetbrains.kotlin:atomicfu:$kotlin_version"
Expand Down Expand Up @@ -160,8 +157,12 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core
apply from: rootProject.file("gradle/compile-native-multiplatform.gradle")
}

apply from: rootProject.file("gradle/compile-jsAndWasmShared-multiplatform.gradle")

apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
apply from: rootProject.file("gradle/publish-npm-js.gradle")

apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")

kotlin.sourceSets.commonMain.dependencies {
api project(":$coreModule")
}
Expand All @@ -181,6 +182,7 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core

apply plugin: "bom-conventions"
apply plugin: "java-modularity-conventions"
apply plugin: "version-file-conventions"

if (build_snapshot_train) {
println "Hacking test tasks, removing stress and flaky tests"
Expand Down Expand Up @@ -256,40 +258,6 @@ configure(subprojects.findAll { !unpublished.contains(it.name) }) {
}
}
}

def thisProject = it
if (thisProject.name in sourceless) {
return
}

def versionFileTask = thisProject.tasks.register("versionFileTask") {
def name = thisProject.name.replace("-", "_")
def versionFile = thisProject.layout.buildDirectory.file("${name}.version")
it.outputs.file(versionFile)

it.doLast {
versionFile.get().asFile.text = version.toString()
}
}

List<String> jarTasks
if (isMultiplatform(it)) {
jarTasks = ["jvmJar"]
} else if (it.name == "kotlinx-coroutines-debug") {
// We shadow debug module instead of just packaging it
jarTasks = ["shadowJar"]
} else {
jarTasks = ["jar"]
}

for (name in jarTasks) {
thisProject.tasks.named(name, Jar) {
it.dependsOn versionFileTask
it.from(versionFileTask) {
into("META-INF")
}
}
}
}

// Report Kotlin compiler version when building project
Expand All @@ -303,7 +271,7 @@ allprojects {

// --------------- Configure sub-projects that are published ---------------

def publishTasks = getTasksByName("publish", true) + getTasksByName("publishNpm", true)
def publishTasks = getTasksByName("publish", true)

task deploy(dependsOn: publishTasks)

Expand Down Expand Up @@ -372,3 +340,17 @@ if (CacheRedirector.enabled) {
nodeJsExtension.nodeDownloadBaseUrl = CacheRedirector.maybeRedirect(nodeJsExtension.nodeDownloadBaseUrl)
}
}

// Drop this configuration when the Node.JS version in KGP will support wasm gc milestone 4
// check it here:
// https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
extensions.findByType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension.class).with {
// canary nodejs that supports recent Wasm GC changes
it.nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
it.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")
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/CommunityProjectsBuild.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ private val LOGGER: Logger = Logger.getLogger("Kotlin settings logger")
* Functions in this file are responsible for configuring kotlinx.coroutines build against a custom dev version
* of Kotlin compiler.
* Such configuration is used in a composite community build of Kotlin in order to check whether not-yet-released changes
* are compatible with our libraries (aka "integration testing that substitues lack of unit testing").
* are compatible with our libraries (aka "integration testing that substitutes lack of unit testing").
*/

/**
Expand Down
29 changes: 29 additions & 0 deletions buildSrc/src/main/kotlin/VersionFile.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/

import org.gradle.api.*
import org.gradle.api.tasks.*

/**
* Adds 'module_name.version' file to the project's JAR META-INF
* for the better toolability. See #2941
*/
object VersionFile {
fun registerVersionFileTask(project: Project): TaskProvider<Task> {
val versionFile = project.layout.buildDirectory.file("${project.name.replace('-', '_')}.version")
val version = project.version.toString()
return project.tasks.register("versionFileTask") {
outputs.file(versionFile)
doLast {
versionFile.get().asFile.writeText(version)
}
}
}

fun fromVersionFile(target: AbstractCopyTask, versionFileTask: TaskProvider<Task>) {
target.from(versionFileTask) {
into("META-INF")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ configure(subprojects) {
if (name in sourceless) return@configure
apply(plugin = "kotlinx-atomicfu")
tasks.withType<KotlinCompile<*>>().configureEach {
val isMainTaskName = name == "compileKotlin" || name == "compileKotlinJvm"
val isMainTaskName = name.startsWith("compileKotlin")
kotlinOptions {
languageVersion = getOverriddenKotlinLanguageVersion(project)
apiVersion = getOverriddenKotlinApiVersion(project)
Expand All @@ -19,13 +19,16 @@ configure(subprojects) {
}
val newOptions =
listOf(
"-progressive", "-Xno-param-assertions", "-Xno-receiver-assertions",
"-Xno-call-assertions"
"-progressive",
"-Xno-param-assertions",
"-Xno-receiver-assertions",
"-Xexpect-actual-classes",
"-Xno-call-assertions",
) + optInAnnotations.map { "-opt-in=$it" }
freeCompilerArgs = freeCompilerArgs + newOptions
}
}
}

val KotlinCommonOptions.versionsAreNotOverridden: Boolean
get() = languageVersion == null && apiVersion == null
get() = languageVersion == null && apiVersion == null
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/kotlin-js-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Platform-specific configuration to compile JS modules

import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile
import org.jetbrains.kotlin.gradle.targets.js.*

plugins {
kotlin("js")
Expand All @@ -15,7 +16,7 @@ dependencies {
}

kotlin {
js(LEGACY) {
js(IR) {
moduleName = project.name.removeSuffix("-js")
}

Expand All @@ -35,6 +36,5 @@ tasks.withType<KotlinJsCompile> {
kotlinOptions {
moduleKind = "umd"
sourceMap = true
metaInfo = true
}
}
17 changes: 17 additions & 0 deletions buildSrc/src/main/kotlin/version-file-conventions.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import org.gradle.api.tasks.bundling.*

configure(subprojects.filter { !unpublished.contains(it.name) && it.name !in sourceless }) {
val project = this
val jarTaskName = when {
project.name == "kotlinx-coroutines-debug" -> {
project.apply(plugin = "com.github.johnrengelman.shadow")
"shadowJar"
}
isMultiplatform -> "jvmJar"
else -> "jar"
}
val versionFileTask = VersionFile.registerVersionFileTask(project)
tasks.withType(Jar::class.java).named(jarTaskName) {
VersionFile.fromVersionFile(this, versionFileTask)
}
}
19 changes: 4 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
#

# Kotlin
version=1.7.3-SNAPSHOT
version=1.8.0-RC-SNAPSHOT
group=org.jetbrains.kotlinx
kotlin_version=1.8.20
kotlin_version=1.9.21

# Dependencies
junit_version=4.12
junit5_version=5.7.0
atomicfu_version=0.21.0
atomicfu_version=0.23.1
knit_version=0.5.0-Beta
html_version=0.7.2
lincheck_version=2.18.1
Expand All @@ -33,18 +33,6 @@ androidx_annotation_version=1.1.0
robolectric_version=4.9
baksmali_version=2.2.7

# JS
kotlin.js.compiler=both
gradle_node_version=3.1.1
node_version=10.0.0
npm_version=5.7.1
mocha_version=6.2.2
mocha_headless_chrome_version=1.8.2
mocha_teamcity_reporter_version=3.0.0
source_map_support_version=0.5.16
jsdom_version=15.2.1
jsdom_global_version=3.0.2

# Settings
kotlin.incremental.multiplatform=true
kotlin.native.ignoreDisabledTargets=true
Expand All @@ -58,3 +46,4 @@ kotlinx.atomicfu.enableJvmIrTransformation=true
# When the flag below is set to `true`, AtomicFU cannot process
# usages of `moveForward` in `ConcurrentLinkedList.kt` correctly.
kotlinx.atomicfu.enableJsIrTransformation=false
kotlinx.atomicfu.enableNativeIrTransformation=true
Loading