Skip to content

Commit 57039d5

Browse files
authored
feat: upgrade to Kotlin 2.2.0 (#160)
1 parent 85e4319 commit 57039d5

File tree

13 files changed

+20
-440
lines changed

13 files changed

+20
-440
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 & 29 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;
@@ -412,12 +412,6 @@ public final class aws/sdk/kotlin/crt/http/Headers$Companion {
412412
public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/http/Headers;
413413
}
414414

415-
public final class aws/sdk/kotlin/crt/http/Headers$DefaultImpls {
416-
public static fun contains (Laws/sdk/kotlin/crt/http/Headers;Ljava/lang/String;Ljava/lang/String;)Z
417-
public static fun forEach (Laws/sdk/kotlin/crt/http/Headers;Lkotlin/jvm/functions/Function2;)V
418-
public static fun get (Laws/sdk/kotlin/crt/http/Headers;Ljava/lang/String;)Ljava/lang/String;
419-
}
420-
421415
public final class aws/sdk/kotlin/crt/http/HeadersBuilder {
422416
public fun <init> ()V
423417
public final fun append (Ljava/lang/String;Ljava/lang/String;)V
@@ -616,19 +610,14 @@ public final class aws/sdk/kotlin/crt/http/HttpRequest$Companion {
616610

617611
public abstract interface class aws/sdk/kotlin/crt/http/HttpRequestBodyStream {
618612
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
613+
public fun resetPosition ()Z
614+
public fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
621615
}
622616

623617
public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion {
624618
public final fun fromByteArray ([B)Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;
625619
}
626620

627-
public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$DefaultImpls {
628-
public static fun resetPosition (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;)Z
629-
public static fun sendRequestBody (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
630-
}
631-
632621
public final class aws/sdk/kotlin/crt/http/HttpRequestBuilder {
633622
public fun <init> ()V
634623
public final fun build ()Laws/sdk/kotlin/crt/http/HttpRequest;
@@ -680,22 +669,17 @@ public final class aws/sdk/kotlin/crt/http/HttpStreamMetricsJVMKt {
680669
}
681670

682671
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
672+
public fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
673+
public fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
685674
public abstract fun onResponseComplete (Laws/sdk/kotlin/crt/http/HttpStream;I)V
686675
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
688-
}
689-
690-
public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpls {
691-
public static fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
692-
public static fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
693-
public static fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;I)V
676+
public fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
694677
}
695678

696679
public abstract interface class aws/sdk/kotlin/crt/io/Buffer {
697680
public static final field Companion Laws/sdk/kotlin/crt/io/Buffer$Companion;
698681
public abstract fun copyTo ([BI)I
682+
public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I
699683
public abstract fun getLen ()I
700684
public abstract fun readAll ()[B
701685
}
@@ -704,10 +688,6 @@ public final class aws/sdk/kotlin/crt/io/Buffer$Companion {
704688
public final fun getEmpty ()Laws/sdk/kotlin/crt/io/Buffer;
705689
}
706690

707-
public final class aws/sdk/kotlin/crt/io/Buffer$DefaultImpls {
708-
public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I
709-
}
710-
711691
public final class aws/sdk/kotlin/crt/io/BufferKt {
712692
public static final fun byteArrayBuffer ([B)Laws/sdk/kotlin/crt/io/Buffer;
713693
}

build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ subprojects {
4343
jvmTarget.set(JvmTarget.JVM_1_8)
4444
freeCompilerArgs.add("-Xjdk-release=1.8")
4545
freeCompilerArgs.add("-Xexpect-actual-classes")
46+
freeCompilerArgs.add("-jvm-default=no-compatibility") // https://youtrack.jetbrains.com/issue/KT-77376
4647
}
4748
}
4849
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
@@ -69,7 +70,3 @@ val lintPaths = listOf(
6970
)
7071

7172
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)