Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changes/b2dbabc2-5fa5-4758-a651-b6bcb395d570.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "b2dbabc2-5fa5-4758-a651-b6bcb395d570",
"type": "feature",
"description": "Upgrade to Kotlin 2.2.0"
}
34 changes: 0 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,3 @@ Set the path to `libcrypto.a` either as a command line argument to gradle `-Plib

### Windows


## Elasticurl App

The `elasticurl` project contains an MPP (JVM and Native only) executable that provides a simple testing application for exercising the CRT bindings.

**Native**

```
# replace "PLATFORM" with the target platform you want to run (e.g. macosX64, linuxX64, etc)

./elasticurl/bin/PLATFORM/elasticurl.kexe [OPTIONS] URL
```


**JVM**
```
java -jar ./elasticurl/libs/elasticurl-jvm.jar [OPTIONS] URL
```

NOTE: You can also use the convenience script `./scripts/elasticurlJvm.sh [OPTIONS] URL`

To enable memory tracing specify the environment variable `CRTDEBUG=trace=N` and provide the CLI option `-v trace`

e.g.
```
CRTDEBUG=trace=2 ./elasticurl/bin/macosX64/elasticurl.kexe -v trace https://aws.amazon.com
```


**Integration Test**

Run the simple elasticurl integration test script

`./scripts/elasticurl-test.sh`
38 changes: 9 additions & 29 deletions aws-crt-kotlin/api/aws-crt-kotlin.api
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,10 @@ public final class aws/sdk/kotlin/crt/auth/signing/AwsSigningResult {
public abstract interface class aws/sdk/kotlin/crt/http/Headers {
public static final field Companion Laws/sdk/kotlin/crt/http/Headers$Companion;
public abstract fun contains (Ljava/lang/String;)Z
public abstract fun contains (Ljava/lang/String;Ljava/lang/String;)Z
public fun contains (Ljava/lang/String;Ljava/lang/String;)Z
public abstract fun entries ()Ljava/util/Set;
public abstract fun forEach (Lkotlin/jvm/functions/Function2;)V
public abstract fun get (Ljava/lang/String;)Ljava/lang/String;
public fun forEach (Lkotlin/jvm/functions/Function2;)V
public fun get (Ljava/lang/String;)Ljava/lang/String;
public abstract fun getAll (Ljava/lang/String;)Ljava/util/List;
public abstract fun isEmpty ()Z
public abstract fun names ()Ljava/util/Set;
Expand All @@ -412,12 +412,6 @@ public final class aws/sdk/kotlin/crt/http/Headers$Companion {
public final fun build (Lkotlin/jvm/functions/Function1;)Laws/sdk/kotlin/crt/http/Headers;
}

public final class aws/sdk/kotlin/crt/http/Headers$DefaultImpls {
public static fun contains (Laws/sdk/kotlin/crt/http/Headers;Ljava/lang/String;Ljava/lang/String;)Z
public static fun forEach (Laws/sdk/kotlin/crt/http/Headers;Lkotlin/jvm/functions/Function2;)V
public static fun get (Laws/sdk/kotlin/crt/http/Headers;Ljava/lang/String;)Ljava/lang/String;
}

public final class aws/sdk/kotlin/crt/http/HeadersBuilder {
public fun <init> ()V
public final fun append (Ljava/lang/String;Ljava/lang/String;)V
Expand Down Expand Up @@ -616,19 +610,14 @@ public final class aws/sdk/kotlin/crt/http/HttpRequest$Companion {

public abstract interface class aws/sdk/kotlin/crt/http/HttpRequestBodyStream {
public static final field Companion Laws/sdk/kotlin/crt/http/HttpRequestBodyStream$Companion;
public abstract fun resetPosition ()Z
public abstract fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
public fun resetPosition ()Z
public fun sendRequestBody (Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
}

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

public final class aws/sdk/kotlin/crt/http/HttpRequestBodyStream$DefaultImpls {
public static fun resetPosition (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;)Z
public static fun sendRequestBody (Laws/sdk/kotlin/crt/http/HttpRequestBodyStream;Laws/sdk/kotlin/crt/io/MutableBuffer;)Z
}

public final class aws/sdk/kotlin/crt/http/HttpRequestBuilder {
public fun <init> ()V
public final fun build ()Laws/sdk/kotlin/crt/http/HttpRequest;
Expand Down Expand Up @@ -680,22 +669,17 @@ public final class aws/sdk/kotlin/crt/http/HttpStreamMetricsJVMKt {
}

public abstract interface class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler {
public abstract fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
public abstract fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
public fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
public fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
public abstract fun onResponseComplete (Laws/sdk/kotlin/crt/http/HttpStream;I)V
public abstract fun onResponseHeaders (Laws/sdk/kotlin/crt/http/HttpStream;IILjava/util/List;)V
public abstract fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
}

public final class aws/sdk/kotlin/crt/http/HttpStreamResponseHandler$DefaultImpls {
public static fun onMetrics (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/http/HttpStreamMetrics;)V
public static fun onResponseBody (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;Laws/sdk/kotlin/crt/io/Buffer;)I
public static fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStreamResponseHandler;Laws/sdk/kotlin/crt/http/HttpStream;I)V
public fun onResponseHeadersDone (Laws/sdk/kotlin/crt/http/HttpStream;I)V
}

public abstract interface class aws/sdk/kotlin/crt/io/Buffer {
public static final field Companion Laws/sdk/kotlin/crt/io/Buffer$Companion;
public abstract fun copyTo ([BI)I
public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I
public abstract fun getLen ()I
public abstract fun readAll ()[B
}
Expand All @@ -704,10 +688,6 @@ public final class aws/sdk/kotlin/crt/io/Buffer$Companion {
public final fun getEmpty ()Laws/sdk/kotlin/crt/io/Buffer;
}

public final class aws/sdk/kotlin/crt/io/Buffer$DefaultImpls {
public static synthetic fun copyTo$default (Laws/sdk/kotlin/crt/io/Buffer;[BIILjava/lang/Object;)I
}

public final class aws/sdk/kotlin/crt/io/BufferKt {
public static final fun byteArrayBuffer ([B)Laws/sdk/kotlin/crt/io/Buffer;
}
Expand Down
5 changes: 1 addition & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ subprojects {
jvmTarget.set(JvmTarget.JVM_1_8)
freeCompilerArgs.add("-Xjdk-release=1.8")
freeCompilerArgs.add("-Xexpect-actual-classes")
freeCompilerArgs.add("-jvm-default=no-compatibility") // https://youtrack.jetbrains.com/issue/KT-77376
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
Expand All @@ -69,7 +70,3 @@ val lintPaths = listOf(
)

configureLinting(lintPaths)

apiValidation {
ignoredProjects += setOf("elasticurl")
}
52 changes: 0 additions & 52 deletions elasticurl/build.gradle.kts

This file was deleted.

161 changes: 0 additions & 161 deletions elasticurl/src/commonMain/kotlin/Application.kt

This file was deleted.

Loading
Loading