Merge branch 'develop'

Author: fzhinkin

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.8.0
+> Published 24 June 2025
+
+### Features
+- Updated Kotlin version to 2.2, Dokka to 2.0.0 and also updated few other dependencies [#455](https://github.com/Kotlin/kotlinx-io/pull/455), [#432](https://github.com/Kotlin/kotlinx-io/pull/432), [#442](https://github.com/Kotlin/kotlinx-io/pull/442), [#456](https://github.com/Kotlin/kotlinx-io/pull/456)
+- Increased deprecation level for `kotlinx.io.files.Path.source` and `kotlinx.io.files.Path.sink` to `ERROR` [#457](https://github.com/Kotlin/kotlinx-io/pull/457)
+### Bugfixes
+- Fixed `ArrayIndexOutOfBoundsException` thrown from `okio.Sink.asKotlinxIoRawSink` [#453](https://github.com/Kotlin/kotlinx-io/pull/453)
+
 ## 0.7.0
 > Published 26 February 2025
  

README.md

@@ -49,7 +49,7 @@ repositories {
 Add the library to dependencies:
 ```kotlin
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.7.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.8.0")
 }
 ```
 
@@ -59,7 +59,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.7.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.8.0")
             }
         }
     }
@@ -73,7 +73,7 @@ Add the library to dependencies:
 <dependency>
     <groupId>org.jetbrains.kotlinx</groupId>
     <artifactId>kotlinx-io-core-jvm</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0</version>
 </dependency>
 ```
 

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-android-compat.gradle.kts

@@ -9,7 +9,7 @@ pluginManager.withPlugin("org.gradle.java-base") {
     apply(plugin = "ru.vyarus.animalsniffer")
 
     configure<AnimalSnifferExtension> {
-        sourceSets = listOf((project.extensions.getByName("sourceSets") as SourceSetContainer).getByName("main"))
+        defaultTargets = setOf("jvmMain")
     }
     val signature: Configuration by configurations
     dependencies {

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-dokka.gradle.kts

@@ -1,33 +1,19 @@
 /*
- * Copyright 2017-2024 JetBrains s.r.o. and respective authors and developers.
+ * Copyright 2017-2025 JetBrains s.r.o. and respective authors and developers.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENCE file.
  */
 
-import org.jetbrains.dokka.gradle.*
-import java.net.URL
-
 plugins {
     id("org.jetbrains.dokka")
 }
 
-// shared configuration for all dokka tasks (both partial and multi-module)
-tasks.withType<AbstractDokkaTask>().configureEach {
-    pluginsMapConfiguration.set(
-        mapOf(
-            "org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${
-                rootDir.resolve("dokka-templates")
-            }" }"""
-        )
-    )
-}
-
-tasks.withType<DokkaTaskPartial>().configureEach {
+dokka {
     dokkaSourceSets.configureEach {
         includes.from("Module.md")
 
         sourceLink {
             localDirectory = rootDir
-            remoteUrl = URL("https://github.com/kotlin/kotlinx-io/tree/master")
+            remoteUrl("https://github.com/kotlin/kotlinx-io/tree/master")
             remoteLineSuffix = "#L"
         }
 
@@ -40,5 +26,9 @@ tasks.withType<DokkaTaskPartial>().configureEach {
         // as in kotlinx-io-multiplatform.gradle.kts:configureSourceSet
         val platform = name.dropLast(4)
         samples.from("$platform/test/samples")
+
+    }
+    pluginsConfiguration.html {
+        templatesDir = rootDir.resolve("dokka-templates")
     }
 }

build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-multiplatform.gradle.kts

@@ -6,6 +6,7 @@
 import kotlinx.io.build.configureJava9ModuleInfoCompilation
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import kotlin.jvm.optionals.getOrNull
@@ -30,17 +31,11 @@ kotlin {
     }
 
     jvm {
-        withJava()
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }
-        // can be replaced with just `compilerOptions { }` in Kotlin 2.0
-        compilations.configureEach {
-            compileTaskProvider.configure {
-                compilerOptions {
-                    freeCompilerArgs.add("-Xjvm-default=all")
-                }
-            }
+        compilerOptions {
+            jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
         }
 
         val mrjToolchain = versionCatalog.findVersion("multi.release.toolchain").getOrNull()?.requiredVersion

build.gradle.kts

@@ -34,6 +34,10 @@ dependencies {
     kover(project(":kotlinx-io-core"))
     kover(project(":kotlinx-io-bytestring"))
     kover(project(":kotlinx-io-okio"))
+
+    dokka(project(":kotlinx-io-bytestring"))
+    dokka(project(":kotlinx-io-core"))
+    dokka(project(":kotlinx-io-okio"))
 }
 
 kover {

bytestring/apple/test/ByteStringAppleTest.kt

@@ -12,7 +12,6 @@ import platform.Foundation.NSData
 import platform.Foundation.create
 import platform.posix.memset
 import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
 import kotlin.test.*
 
 @OptIn(UnsafeNumber::class)
@@ -27,12 +26,12 @@ class ByteStringAppleTest {
         assertContentEquals(byteArrayOf(0, 1, 2, 3, 4, 5), copy.bytes!!.readBytes(copy.length.convert()))
     }
 
-    @OptIn(BetaInteropApi::class, ExperimentalEncodingApi::class)
+    @OptIn(BetaInteropApi::class)
     @Test
     fun fromNSData() {
         assertTrue(NSData().toByteString().isEmpty())
         val src = NSData.create(
-            base64EncodedString = Base64.Default.encode(byteArrayOf(0, 1, 2, 3, 4, 5)),
+            base64EncodedString = Base64.encode(byteArrayOf(0, 1, 2, 3, 4, 5)),
             options = 0u
         )!!
         val copy = src.toByteString()

bytestring/apple/test/samples/samplesApple.kt

@@ -12,7 +12,7 @@ import platform.Foundation.*
 import kotlin.test.*
 
 class ByteStringSamplesApple {
-    @OptIn(UnsafeNumber::class, ExperimentalForeignApi::class, ExperimentalStdlibApi::class)
+    @OptIn(UnsafeNumber::class, ExperimentalForeignApi::class)
     @Test
     fun nsDataConversion() {
         val originalByteString: ByteString = "Compress me, please!".encodeToByteString()

bytestring/common/src/Base64.kt

@@ -6,9 +6,6 @@
 package kotlinx.io.bytestring
 
 import kotlin.io.encoding.Base64
-import kotlin.io.encoding.Base64.Default.encode
-import kotlin.io.encoding.Base64.Default.encodeToByteArray
-import kotlin.io.encoding.ExperimentalEncodingApi
 
 /**
  * Encodes bytes from the specified [source] byte string or its subrange.
@@ -30,7 +27,6 @@ import kotlin.io.encoding.ExperimentalEncodingApi
  *
  * @return a [ByteArray] with the resulting symbols.
  */
-@ExperimentalEncodingApi
 public fun Base64.encodeToByteArray(source: ByteString, startIndex: Int = 0, endIndex: Int = source.size): ByteArray {
     return encodeToByteArray(source.getBackingArrayReference(), startIndex, endIndex)
 }
@@ -55,7 +51,6 @@ public fun Base64.encodeToByteArray(source: ByteString, startIndex: Int = 0, end
  *
  * @return the number of symbols written into [destination] array.
  */
-@ExperimentalEncodingApi
 public fun Base64.encodeIntoByteArray(
     source: ByteString,
     destination: ByteArray,
@@ -84,7 +79,6 @@ public fun Base64.encodeIntoByteArray(
  *
  * @return a string with the resulting symbols.
  */
-@ExperimentalEncodingApi
 public fun Base64.encode(
     source: ByteString,
     startIndex: Int = 0,
@@ -110,7 +104,6 @@ public fun Base64.encode(
  *
  * @return the destination appendable.
  */
-@ExperimentalEncodingApi
 public fun <A : Appendable> Base64.encodeToAppendable(
     source: ByteString,
     destination: A,
@@ -139,7 +132,6 @@ public fun <A : Appendable> Base64.encodeToAppendable(
  *
  * @return a [ByteArray] with the resulting bytes.
  */
-@ExperimentalEncodingApi
 public fun Base64.decode(source: ByteString, startIndex: Int = 0, endIndex: Int = source.size): ByteArray {
     return decode(source.getBackingArrayReference(), startIndex, endIndex)
 }
@@ -162,7 +154,6 @@ public fun Base64.decode(source: ByteString, startIndex: Int = 0, endIndex: Int
  *
  * @return a [ByteArray] with the resulting bytes.
  */
-@ExperimentalEncodingApi
 public fun Base64.decodeToByteString(source: CharSequence, startIndex: Int = 0, endIndex: Int = source.length): ByteString {
     return ByteString.wrap(decode(source, startIndex, endIndex))
 }
@@ -189,7 +180,6 @@ public fun Base64.decodeToByteString(source: CharSequence, startIndex: Int = 0,
  *
  * @return the number of bytes written into [destination] array.
  */
-@ExperimentalEncodingApi
 public fun Base64.decodeIntoByteArray(
     source: ByteString,
     destination: ByteArray,
@@ -218,7 +208,6 @@ public fun Base64.decodeIntoByteArray(
  *
  * @return a [ByteString] with the resulting bytes.
  */
-@ExperimentalEncodingApi
 public fun Base64.decodeToByteString(source: ByteArray, startIndex: Int = 0, endIndex: Int = source.size): ByteString {
     return ByteString.wrap(decode(source, startIndex, endIndex))
 }
@@ -241,7 +230,6 @@ public fun Base64.decodeToByteString(source: ByteArray, startIndex: Int = 0, end
  *
  * @return a [ByteString] with the resulting bytes.
  */
-@ExperimentalEncodingApi
 public fun Base64.decodeToByteString(source: ByteString, startIndex: Int = 0, endIndex: Int = source.size): ByteString {
     return ByteString.wrap(decode(source.getBackingArrayReference(), startIndex, endIndex))
 }

bytestring/common/src/Hex.kt

@@ -14,7 +14,6 @@ package kotlinx.io.bytestring
  *
  * @throws IllegalArgumentException if the result length is more than [String] maximum capacity.
  */
-@ExperimentalStdlibApi
 public fun ByteString.toHexString(format: HexFormat = HexFormat.Default): String {
     return getBackingArrayReference().toHexString(0, getBackingArrayReference().size, format)
 }
@@ -32,7 +31,6 @@ public fun ByteString.toHexString(format: HexFormat = HexFormat.Default): String
  * @throws IllegalArgumentException when `startIndex > endIndex`.
  * @throws IllegalArgumentException if the result length is more than [String] maximum capacity.
  */
-@ExperimentalStdlibApi
 public fun ByteString.toHexString(
     startIndex: Int = 0,
     endIndex: Int = size,
@@ -52,7 +50,6 @@ public fun ByteString.toHexString(
  *
  * @throws IllegalArgumentException if this string does not comply with the specified [format].
  */
-@ExperimentalStdlibApi
 public fun String.hexToByteString(format: HexFormat = HexFormat.Default): ByteString {
     return ByteString.wrap(hexToByteArray(format))
 }