Skip to content

Commit fff5951

Browse files
lauzadislauzadis
committed
Merge branch 'main' of github.com:awslabs/aws-crt-kotlin into kn-main-bump
2 parents 485086c + b4a4aab commit fff5951

File tree

9 files changed

+33
-77
lines changed

9 files changed

+33
-77
lines changed

‎.changes/aa10152c-0040-46b3-8551-ed63aca0c6ee.json‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## [0.10.2] - 07/24/2025
4+
5+
## [0.10.1] - 07/21/2025
6+
7+
## [0.10.0] - 07/15/2025
8+
9+
### Features
10+
* Upgrade to Kotlin 2.2.0
11+
12+
### Fixes
13+
* [#1295](https://github.com/smithy-lang/smithy-kotlin/issues/1295) Enable building this project on JDK21 by setting -Xjdk-release flag
14+
315
## [0.9.2] - 06/18/2025
416

517
### Fixes

‎aws-crt-kotlin/api/aws-crt-kotlin.api‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -406,10 +406,10 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningResult {
406406
public abstract interface class aws/sdk/kotlin/crt/http/Headers {
407407
public static final field Companion Laws/sdk/kotlin/crt/http/Headers$Companion;
408408
public abstract fun contains (Ljava/lang/String;)Z
409-
public abstract fun contains (Ljava/lang/String;Ljava/lang/String;)Z
409+
public fun contains (Ljava/lang/String;Ljava/lang/String;)Z
410410
public abstract fun entries ()Ljava/util/Set;
411-
public abstract fun forEach (Lkotlin/jvm/functions/Function2;)V
412-
public abstract fun get (Ljava/lang/String;)Ljava/lang/String;
411+
public fun forEach (Lkotlin/jvm/functions/Function2;)V
412+
public fun get (Ljava/lang/String;)Ljava/lang/String;
413413
public abstract fun getAll (Ljava/lang/String;)Ljava/util/List;
414414
public abstract fun isEmpty ()Z
415415
public abstract fun names ()Ljava/util/Set;
@@ -622,8 +622,8 @@ public final class aws/sdk/kotlin/crt/http/HttpRequest$Companion {
622622

623623
public abstract interface class aws/sdk/kotlin/crt/http/HttpRequestBodyStream {
624624
public static final field Companion Laws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion;
625-
public abstract fun resetPosition ()Z
626-
public abstract fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
625+
public fun resetPosition ()Z
626+
public fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
627627
}
628628

629629
public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion {
@@ -686,11 +686,11 @@ public final class aws/sdk/kotlin/crt/http/HttpStreamMetricsJVMKt {
686686
}
687687

688688
public abstract interface class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler {
689-
public abstract fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
690-
public abstract fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
689+
public fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
690+
public fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
691691
public abstract fun onResponseComplete (Laws/sdk/kotlin/crt/http/HttpStream;I)V
692692
public abstract fun onResponseHeaders (Laws/sdk/kotlin/crt/http/HttpStream;IILjava/util/List;)V
693-
public abstract fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
693+
public fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
694694
}
695695

696696
public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpls {
@@ -702,6 +702,7 @@ public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpl
702702
public abstract interface class aws/sdk/kotlin/crt/io/Buffer {
703703
public static final field Companion Laws/sdk/kotlin/crt/io/Buffer$Companion;
704704
public abstract fun copyTo ([BI)I
705+
public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I
705706
public abstract fun getLen ()I
706707
public abstract fun readAll ()[B
707708
}
@@ -818,14 +819,8 @@ public final class aws/sdk/kotlin/crt/io/SocketType : java/lang/Enum {
818819
}
819820

820821
public final class aws/sdk/kotlin/crt/io/TlsCipherPreference : java/lang/Enum {
821-
public static final field KMS_PQ_SIKE_TLS_V1_0_2019_11 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
822-
public static final field KMS_PQ_SIKE_TLS_V1_0_2020_02 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
823-
public static final field KMS_PQ_TLS_V1_0_2019_06 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
824-
public static final field KMS_PQ_TLS_V1_0_2020_02 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
825-
public static final field KMS_PQ_TLS_V1_0_2020_07 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
826822
public static final field PQ_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference;
827823
public static final field PQ_TLSV1_2_2024_10 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
828-
public static final field PQ_TLS_V1_0_2021_05 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
829824
public static final field SYSTEM_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference;
830825
public static fun getEntries ()Lkotlin/enums/EnumEntries;
831826
public final fun getValue ()I

‎aws-crt-kotlin/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
}
1919

2020
val sdkVersion: String by project
21-
group = properties["publishGroupName"] ?: error("missing publishGroupName")
21+
group = "aws.sdk.kotlin.crt"
2222
version = sdkVersion
2323
description = "Kotlin Multiplatform bindings for AWS Common Runtime"
2424

‎aws-crt-kotlin/common/src/aws/sdk/kotlin/crt/io/TlsCipherPreference.kt‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,6 @@ public enum class TlsCipherPreference(public val value: Int) {
1818
*/
1919
SYSTEM_DEFAULT(0),
2020

21-
/**
22-
* This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.
23-
*/
24-
@Deprecated("This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.")
25-
KMS_PQ_TLS_V1_0_2019_06(1),
26-
27-
/**
28-
* This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.
29-
*/
30-
@Deprecated("This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.")
31-
KMS_PQ_SIKE_TLS_V1_0_2019_11(2),
32-
33-
/**
34-
* This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.
35-
*/
36-
@Deprecated("This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.")
37-
KMS_PQ_TLS_V1_0_2020_02(3),
38-
39-
/**
40-
* This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.
41-
*/
42-
@Deprecated("This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.")
43-
KMS_PQ_SIKE_TLS_V1_0_2020_02(4),
44-
45-
/**
46-
* This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.
47-
*/
48-
@Deprecated("This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.")
49-
KMS_PQ_TLS_V1_0_2020_07(5),
50-
51-
/**
52-
* This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.
53-
*/
54-
@Deprecated("This cipher preference is no longer supported. Use PQ_TLSV1_2_2024_10 instead.")
55-
PQ_TLS_V1_0_2021_05(6),
56-
5721
/**
5822
* This TLS cipher preference list contains post-quantum key exchange algorithms that have been standardized by
5923
* NIST. PQ algorithms in this preference list will be used in hybrid mode, and always combined with a classical

‎aws-crt-kotlin/jvm/src/aws/sdk/kotlin/crt/io/TlsContextJVM.kt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,8 @@ internal actual fun isCipherSupported(cipher: TlsCipherPreference): Boolean =
2727

2828
internal actual fun isAlpnSupported(): Boolean = TlsContextOptionsJni.isAlpnSupported()
2929

30-
@Suppress("DEPRECATION")
3130
private fun TlsCipherPreference.into(): TlsCipherPreferenceJni = when (this) {
3231
TlsCipherPreference.SYSTEM_DEFAULT -> TlsCipherPreferenceJni.TLS_CIPHER_SYSTEM_DEFAULT
33-
TlsCipherPreference.KMS_PQ_TLS_V1_0_2019_06 -> TlsCipherPreferenceJni.TLS_CIPHER_KMS_PQ_TLSv1_0_2019_06
34-
TlsCipherPreference.KMS_PQ_SIKE_TLS_V1_0_2019_11 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_KMS_PQ_SIKE_TLSv1_0_2019_11
35-
TlsCipherPreference.KMS_PQ_TLS_V1_0_2020_02 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_KMS_PQ_TLSv1_0_2020_02
36-
TlsCipherPreference.KMS_PQ_SIKE_TLS_V1_0_2020_02 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_KMS_PQ_SIKE_TLSv1_0_2020_02
37-
TlsCipherPreference.KMS_PQ_TLS_V1_0_2020_07 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_KMS_PQ_TLSv1_0_2020_07
38-
TlsCipherPreference.PQ_TLS_V1_0_2021_05 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_PQ_TLSv1_0_2021_05
3932
TlsCipherPreference.PQ_TLSV1_2_2024_10 -> TlsCipherPreferenceJni.TLS_CIPHER_PREF_PQ_TLSv1_2_2023
4033
TlsCipherPreference.PQ_DEFAULT -> TlsCipherPreferenceJni.TLS_CIPHER_PQ_DEFAULT
4134
}

‎build.gradle.kts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55
import aws.sdk.kotlin.gradle.dsl.configureLinting
6-
import aws.sdk.kotlin.gradle.dsl.configureNexus
6+
import aws.sdk.kotlin.gradle.dsl.configureJReleaser
77
import aws.sdk.kotlin.gradle.util.typedProp
88
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
99

@@ -67,7 +67,7 @@ if (project.typedProp<Boolean>("kotlinWarningsAsErrors") == true) {
6767
}
6868

6969
// Publishing
70-
configureNexus()
70+
configureJReleaser()
7171

7272
// Code Style
7373
val lintPaths = listOf(
@@ -76,3 +76,6 @@ val lintPaths = listOf(
7676
)
7777

7878
configureLinting(lintPaths)
79+
80+
// https://github.com/jreleaser/jreleaser/issues/1492
81+
tasks.register("clean") {}

‎gradle.properties‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,4 @@ kotlin.daemon.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
77
org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
88

99
# aws-crt-kotlin
10-
sdkVersion=0.9.3-SNAPSHOT
11-
12-
# publishing
13-
publishGroupName=aws.sdk.kotlin.crt
10+
sdkVersion=0.10.3-SNAPSHOT

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
[versions]
2-
kotlin-version = "2.1.0"
2+
kotlin-version = "2.2.0"
33

44
aws-kotlin-repo-tools-version = "0.4.29-kn"
55

66
# libs
77
crt-java-version = "0.38.1"
8-
coroutines-version = "1.9.0"
9-
binary-compatibility-validator-version = "0.16.3"
8+
coroutines-version = "1.10.2"
9+
binary-compatibility-validator-version = "0.18.0"
1010

1111
# testing
12-
junit-version = "5.10.1"
12+
junit-version = "5.13.2"
13+
kotest-version = "5.9.1"
1314
mock-server-version = "5.15.0"
1415

1516
[libraries]
@@ -19,7 +20,6 @@ crt-java = { module = "software.amazon.awssdk.crt:aws-crt", version.ref = "crt-j
1920
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version"}
2021
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin-version" }
2122

22-
2323
kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "coroutines-version" }
2424
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines-version" }
2525
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines-version" }

0 commit comments

Comments
 (0)