Skip to content

Commit b32411a

Browse files
authored
kn: final merge from main! (#177)
1 parent 6764ff8 commit b32411a

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "5b6cf8f2-eff6-4def-a335-1de5052a810a",
3+
"type": "feature",
4+
"description": "Add support for Kotlin/Native"
5+
}
Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
name: Setup build
2-
description: >
3-
Common repository and build tool setup
4-
5-
inputs:
6-
# note nested virtualization is not supported on current arm64 mac runners: https://github.com/runfinch/finch/issues/812
7-
install-finch:
8-
description: 'Flag to install finch OCI tooling on mac hosts'
9-
default: 'false'
10-
required: false
2+
description: Common repository and build tool setup
113

124
runs:
135
using: composite
@@ -19,6 +11,7 @@ runs:
1911
distribution: 'corretto'
2012
java-version: 17
2113
cache: 'gradle'
14+
2215
# Cache the Kotlin/Native toolchain based on the input Kotlin version from version catalog
2316
# see https://kotlinlang.org/docs/native-improving-compilation-time.html
2417
- name: Cache Kotlin Native toolchain
@@ -29,10 +22,3 @@ runs:
2922
key: ${{ runner.os }}-konan-${{ hashFiles('gradle/libs.versions.toml') }}
3023
restore-keys: |
3124
${{ runner.os }}-konan-
32-
- name: Install finch OCI client
33-
if: ${{ runner.os == 'macOS' && inputs.install-finch == 'true' }}
34-
shell: bash
35-
run: |
36-
brew update
37-
brew install --cask finch
38-
finch vm init

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
name: test-reports-jvm-${{ matrix.java-version }}
5151
path: '**/build/reports'
5252

53-
# macos-14 build and test for targets: jvm, macoArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
54-
# macos-13 build and test for targets: jvm, macoX64, iosX64, tvosX64, watchosX64
53+
# macos-14 build and test for targets: jvm, macosArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
54+
# macos-13 build and test for targets: jvm, macosX64, iosX64, tvosX64, watchosX64
5555
macos:
5656
strategy:
5757
fail-fast: false

CHANGELOG.md

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

3+
## [0.10.3] - 08/12/2025
4+
35
## [0.10.2] - 07/24/2025
46

57
## [0.10.1] - 07/21/2025

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ See also:
7070

7171
### Windows
7272
Ensure Docker is installed, then build the image using `./docker-images/build-all.sh`.
73-
Run a `./gradlew build` and the build and tests should be routed through to the container.
73+
Run a `./gradlew build` and the build and tests should be routed through to the container.

aws-crt-kotlin/common/test/aws/sdk/kotlin/crt/io/UriTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ class UriTest : CrtTest() {
182182
assertEquals(expected, uri.toString())
183183
}
184184

185-
@Ignore // FIXME Enable when Kotlin/Native implementation is complete
186185
@Test
187186
fun itParses() {
188187
val uri = "https://test.aws.com:8000/kotlin?foo=baz"

gradle.properties

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

99
# aws-crt-kotlin
10-
sdkVersion=0.10.3-SNAPSHOT
10+
sdkVersion=0.10.4-SNAPSHOT

0 commit comments

Comments
 (0)