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
Empty file added .changes/.gitkeep
Empty file.
5 changes: 5 additions & 0 deletions .changes/e74675f3-d983-45f1-b551-98b0f248db83.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"id": "e74675f3-d983-45f1-b551-98b0f248db83",
"type": "misc",
"description": "upgrade kotlin to 1.6.21 and other deps to latest"
}
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
shell: bash
run: |
systeminfo
sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx4g/' gradle.properties
sed -i 's/org\.gradle\.jvmargs=.*$/org.gradle.jvmargs=-Xmx2g/' gradle.properties
echo "org.gradle.parallel=false" >> gradle.properties
cat gradle.properties
- name: Build and Test ${{ env.PACKAGE_NAME }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package aws.sdk.kotlin.runtime
level = RequiresOptIn.Level.ERROR,
message = "This API is internal to aws-runtime and generated SDKs and should not be used. It could be removed or changed without notice."
)
@Experimental(level = Experimental.Level.ERROR)
@Target(
AnnotationTarget.CLASS,
AnnotationTarget.TYPEALIAS,
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import java.util.Properties
import java.net.URL

plugins {
kotlin("jvm") version "1.6.10" apply false
kotlin("jvm") version "1.6.21" apply false
id("org.jetbrains.dokka")
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
}
Expand Down
11 changes: 10 additions & 1 deletion builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@
"hosts": {
"windows": {
"!imports": [],
"!env": {}
"!env": {},
"!test_steps": [
"{gradlew} publishToMavenLocal",
"{gradlew} test allTests",
"systeminfo",
"{gradlew} --status",
"{gradlew} --stop",
"systeminfo",
"{gradlew} testAllProtocols"
]
}
},
"_comment": "prebuild step defined in .builder/actions/set_upstream_versions.py",
Expand Down
2 changes: 1 addition & 1 deletion examples/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
kotlin("jvm") version "1.6.10"
kotlin("jvm") version "1.6.20"
}

val awsSdkKotlinVersion: String by project
Expand Down
24 changes: 12 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@ smithyGradleVersion=0.5.3
smithyKotlinVersion=0.9.2

# kotlin
kotlinVersion=1.6.10
dokkaVersion=1.6.10
kotlinVersion=1.6.21
dokkaVersion=1.6.21

# kotlin JVM
kotlinJVMTargetVersion=1.8

# kotlin libraries
coroutinesVersion=1.6.0
atomicFuVersion=0.17.0
kotlinxSerializationVersion=1.3.1
ktorVersion=1.6.7
coroutinesVersion=1.6.1
atomicFuVersion=0.17.1
kotlinxSerializationVersion=1.3.2
ktorVersion=1.6.8

# crt
crtKotlinVersion=0.5.4

# testing/utility
junitVersion=5.6.2
ktlintVersion=0.42.1
kotestVersion=4.6.2
jacocoVersion=0.8.7
mockkVersion=1.12.2
junitVersion=5.8.2
ktlintVersion=0.45.2
kotestVersion=5.3.0
jacocoVersion=0.8.8
mockkVersion=1.12.3

# logging - JVM
slf4jVersion=1.7.30
slf4jVersion=1.7.36

# dokka config (values specified at build-time as needed)
smithyKotlinPackageListUrl=
Expand Down
1 change: 0 additions & 1 deletion gradle/sdk-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists