Skip to content

Commit

Permalink
feat: bump kotlin version to 1.9.24
Browse files Browse the repository at this point in the history
Also:

- bump dokka version to 1.9.20
- target JVM 17 output
  • Loading branch information
Steven Yuan authored and syall committed May 8, 2024
1 parent 7ea4121 commit e52c977
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

plugins {
kotlin("jvm") version "1.5.31" apply false
kotlin("jvm")
id("org.jetbrains.dokka")
}

Expand Down
16 changes: 15 additions & 1 deletion codegen/smithy-aws-swift-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0.
*/
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm")
jacoco
Expand All @@ -21,7 +24,7 @@ val junitVersion: String by project
val jacocoVersion: String by project

dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib"))
api("software.amazon.smithy:smithy-swift-codegen:$smithySwiftVersion")
api("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
api("software.amazon.smithy:smithy-aws-iam-traits:$smithyVersion")
Expand All @@ -33,6 +36,17 @@ dependencies {
implementation("software.amazon.smithy:smithy-aws-endpoints:$smithyVersion")
}

tasks.withType<KotlinCompile> {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_17.toString()
targetCompatibility = JavaVersion.VERSION_17.toString()
}

jacoco {
toolVersion = "$jacocoVersion"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ abstract class AWSHttpBindingProtocolGenerator : HttpBindingProtocolGenerator()
var testCount = 0

ctx.service.getTrait<EndpointTestsTrait>()?.let { testsTrait ->
if (testsTrait?.testCases.isEmpty()) {
if (testsTrait.testCases?.isEmpty() == true) {
return 0
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ smithyGradleVersion=0.6.0
smithySwiftVersion = 0.1.0

# kotlin
kotlinVersion=1.5.31
dokkaVersion=1.5.31
kotlinVersion=1.9.24
dokkaVersion=1.9.20
kotlin.native.ignoreDisabledTargets=true

# testing/utility
Expand Down
9 changes: 9 additions & 0 deletions scripts/ci_steps/log_tool_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ else
fi
echo

if command -v kotlin &> /dev/null
then
which kotlin
kotlin -version
else
echo "kotlin not installed"
fi
echo

if command -v xcbeautify &> /dev/null
then
which xcbeautify
Expand Down

0 comments on commit e52c977

Please sign in to comment.