Skip to content

Commit 847980c

Browse files
authored
chore: upgrade kotlin 1.6.20; gradle 7.4.2; bump deps (#574)
1 parent 57346af commit 847980c

File tree

10 files changed

+31
-19
lines changed

10 files changed

+31
-19
lines changed

.changes/.gitkeep

Whitespace-only changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"id": "e74675f3-d983-45f1-b551-98b0f248db83",
3+
"type": "misc",
4+
"description": "upgrade kotlin to 1.6.21 and other deps to latest"
5+
}

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
shell: bash
7474
run: |
7575
systeminfo
76-
sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx4g/' gradle.properties
76+
sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx2g/' gradle.properties
7777
echo "org.gradle.parallel=false" >> gradle.properties
7878
cat gradle.properties
7979
- name: Build and Test ${{ env.PACKAGE_NAME }}

aws-runtime/aws-core/common/src/aws/sdk/kotlin/runtime/Annotations.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package aws.sdk.kotlin.runtime
1818
level = RequiresOptIn.Level.ERROR,
1919
message = "This API is internal to aws-runtime and generated SDKs and should not be used. It could be removed or changed without notice."
2020
)
21-
@Experimental(level = Experimental.Level.ERROR)
2221
@Target(
2322
AnnotationTarget.CLASS,
2423
AnnotationTarget.TYPEALIAS,

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.util.Properties
66
import java.net.URL
77

88
plugins {
9-
kotlin("jvm") version "1.6.10" apply false
9+
kotlin("jvm") version "1.6.21" apply false
1010
id("org.jetbrains.dokka")
1111
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
1212
}

builder.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
"hosts": {
1616
"windows": {
1717
"!imports": [],
18-
"!env": {}
18+
"!env": {},
19+
"!test_steps": [
20+
"{gradlew} publishToMavenLocal",
21+
"{gradlew} test allTests",
22+
"systeminfo",
23+
"{gradlew} --status",
24+
"{gradlew} --stop",
25+
"systeminfo",
26+
"{gradlew} testAllProtocols"
27+
]
1928
}
2029
},
2130
"_comment": "prebuild step defined in .builder/actions/set_upstream_versions.py",

examples/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "1.6.10"
2+
kotlin("jvm") version "1.6.20"
33
}
44

55
val awsSdkKotlinVersion: String by project

gradle.properties

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@ smithyGradleVersion=0.5.3
1515
smithyKotlinVersion=0.9.2
1616

1717
# kotlin
18-
kotlinVersion=1.6.10
19-
dokkaVersion=1.6.10
18+
kotlinVersion=1.6.21
19+
dokkaVersion=1.6.21
2020

2121
# kotlin JVM
2222
kotlinJVMTargetVersion=1.8
2323

2424
# kotlin libraries
25-
coroutinesVersion=1.6.0
26-
atomicFuVersion=0.17.0
27-
kotlinxSerializationVersion=1.3.1
28-
ktorVersion=1.6.7
25+
coroutinesVersion=1.6.1
26+
atomicFuVersion=0.17.1
27+
kotlinxSerializationVersion=1.3.2
28+
ktorVersion=1.6.8
2929

3030
# crt
3131
crtKotlinVersion=0.5.4
3232

3333
# testing/utility
34-
junitVersion=5.6.2
35-
ktlintVersion=0.42.1
36-
kotestVersion=4.6.2
37-
jacocoVersion=0.8.7
38-
mockkVersion=1.12.2
34+
junitVersion=5.8.2
35+
ktlintVersion=0.45.2
36+
kotestVersion=5.3.0
37+
jacocoVersion=0.8.8
38+
mockkVersion=1.12.3
3939

4040
# logging - JVM
41-
slf4jVersion=1.7.30
41+
slf4jVersion=1.7.36
4242

4343
# dokka config (values specified at build-time as needed)
4444
smithyKotlinPackageListUrl=

gradle/sdk-plugins/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
43
* SPDX-License-Identifier: Apache-2.0.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)