Skip to content

Commit 3c5e2e4

Browse files
authored
chore: release v1.5 (#165)
1 parent a8f6051 commit 3c5e2e4

File tree

16 files changed

+20
-469
lines changed

16 files changed

+20
-469
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "b2dbabc2-5fa5-4758-a651-b6bcb395d570",
3+
"type": "feature",
4+
"description": "Upgrade to Kotlin 2.2.0"
5+
}

README.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,3 @@ Set the path to `libcrypto.a` either as a command line argument to gradle `-Plib
3535

3636
### Windows
3737

38-
39-
## Elasticurl App
40-
41-
The `elasticurl` project contains an MPP (JVM and Native only) executable that provides a simple testing application for exercising the CRT bindings.
42-
43-
**Native**
44-
45-
```
46-
# replace "PLATFORM" with the target platform you want to run (e.g. macosX64, linuxX64, etc)
47-
48-
./elasticurl/bin/PLATFORM/elasticurl.kexe [OPTIONS] URL
49-
```
50-
51-
52-
**JVM**
53-
```
54-
java -jar ./elasticurl/libs/elasticurl-jvm.jar [OPTIONS] URL
55-
```
56-
57-
NOTE: You can also use the convenience script `./scripts/elasticurlJvm.sh [OPTIONS] URL`
58-
59-
To enable memory tracing specify the environment variable `CRTDEBUG=trace=N` and provide the CLI option `-v trace`
60-
61-
e.g.
62-
```
63-
CRTDEBUG=trace=2 ./elasticurl/bin/macosX64/elasticurl.kexe -v trace https://aws.amazon.com
64-
```
65-
66-
67-
**Integration Test**
68-
69-
Run the simple elasticurl integration test script
70-
71-
`./scripts/elasticurl-test.sh`

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,10 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningResult {
399399
public abstract interface class aws/sdk/kotlin/crt/http/Headers {
400400
public static final field Companion Laws/sdk/kotlin/crt/http/Headers$Companion;
401401
public abstract fun contains (Ljava/lang/String;)Z
402-
public abstract fun contains (Ljava/lang/String;Ljava/lang/String;)Z
402+
public fun contains (Ljava/lang/String;Ljava/lang/String;)Z
403403
public abstract fun entries ()Ljava/util/Set;
404-
public abstract fun forEach (Lkotlin/jvm/functions/Function2;)V
405-
public abstract fun get (Ljava/lang/String;)Ljava/lang/String;
404+
public fun forEach (Lkotlin/jvm/functions/Function2;)V
405+
public fun get (Ljava/lang/String;)Ljava/lang/String;
406406
public abstract fun getAll (Ljava/lang/String;)Ljava/util/List;
407407
public abstract fun isEmpty ()Z
408408
public abstract fun names ()Ljava/util/Set;
@@ -616,8 +616,8 @@ public final class aws/sdk/kotlin/crt/http/HttpRequest$Companion {
616616

617617
public abstract interface class aws/sdk/kotlin/crt/http/HttpRequestBodyStream {
618618
public static final field Companion Laws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion;
619-
public abstract fun resetPosition ()Z
620-
public abstract fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
619+
public fun resetPosition ()Z
620+
public fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
621621
}
622622

623623
public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion {
@@ -680,11 +680,11 @@ public final class aws/sdk/kotlin/crt/http/HttpStreamMetricsJVMKt {
680680
}
681681

682682
public abstract interface class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler {
683-
public abstract fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
684-
public abstract fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
683+
public fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
684+
public fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
685685
public abstract fun onResponseComplete (Laws/sdk/kotlin/crt/http/HttpStream;I)V
686686
public abstract fun onResponseHeaders (Laws/sdk/kotlin/crt/http/HttpStream;IILjava/util/List;)V
687-
public abstract fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
687+
public fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
688688
}
689689

690690
public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpls {
@@ -696,6 +696,7 @@ public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpl
696696
public abstract interface class aws/sdk/kotlin/crt/io/Buffer {
697697
public static final field Companion Laws/sdk/kotlin/crt/io/Buffer$Companion;
698698
public abstract fun copyTo ([BI)I
699+
public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I
699700
public abstract fun getLen ()I
700701
public abstract fun readAll ()[B
701702
}
@@ -810,14 +811,8 @@ public final class aws/sdk/kotlin/crt/io/SocketType : java/lang/Enum {
810811
}
811812

812813
public final class aws/sdk/kotlin/crt/io/TlsCipherPreference : java/lang/Enum {
813-
public static final field KMS_PQ_SIKE_TLS_V1_0_2019_11 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
814-
public static final field KMS_PQ_SIKE_TLS_V1_0_2020_02 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
815-
public static final field KMS_PQ_TLS_V1_0_2019_06 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
816-
public static final field KMS_PQ_TLS_V1_0_2020_02 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
817-
public static final field KMS_PQ_TLS_V1_0_2020_07 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
818814
public static final field PQ_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference;
819815
public static final field PQ_TLSV1_2_2024_10 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
820-
public static final field PQ_TLS_V1_0_2021_05 Laws/sdk/kotlin/crt/io/TlsCipherPreference;
821816
public static final field SYSTEM_DEFAULT Laws/sdk/kotlin/crt/io/TlsCipherPreference;
822817
public static fun getEntries ()Lkotlin/enums/EnumEntries;
823818
public final fun getValue ()I

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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,3 @@ val lintPaths = listOf(
6969
)
7070

7171
configureLinting(lintPaths)
72-
73-
apiValidation {
74-
ignoredProjects += setOf("elasticurl")
75-
}

elasticurl/build.gradle.kts

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

elasticurl/src/commonMain/kotlin/Application.kt

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

0 commit comments

Comments
 (0)