Skip to content

Commit

Permalink
Upgrade to Gradle 7 (#1411)
Browse files Browse the repository at this point in the history
* Upgrade to Gradle 7

* Document the upgrade and update changelogs
  • Loading branch information
rcoh authored Jun 23, 2022
1 parent 5b49350 commit edb1394
Show file tree
Hide file tree
Showing 12 changed files with 200 additions and 143 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.next.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@
# message = "Fix typos in module documentation for generated crates"
# references = ["smithy-rs#920"]
# meta = { "breaking" = false, "tada" = false, "bug" = false }
# author = "rcoh"
# author = "rcoh"
[[smithy-rs]]
message = "Upgrade to Gradle 7. This change is not a breaking change, however, users of smithy-rs will need to switch to JDK 17"
references = ["smithy-rs#1411", "smithy-rs#1167"]
meta = { "breaking" = false, "tada" = true, "bug" = false }
author = "rcoh"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The latest unreleased SDK build can be found in [aws-sdk-rust/next](https://gith
Setup
-----

1. `./gradlew` will setup gradle for you. JDK 11 is required.
1. `./gradlew` will setup gradle for you. JDK 17 is required.
2. Running tests requires a working Rust installation. See [Rust docs](https://www.rust-lang.org/learn/get-started) for
installation instructions on your platform. Minimum supported Rust version is the latest released Rust version, although older versions may work.

Expand Down
1 change: 0 additions & 1 deletion aws/sdk-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
plugins {
kotlin("jvm")
jacoco
maven
`maven-publish`
}

Expand Down
1 change: 0 additions & 1 deletion codegen-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat

plugins {
kotlin("jvm")
maven
`maven-publish`
}

Expand Down
1 change: 0 additions & 1 deletion codegen-server/python/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat

plugins {
kotlin("jvm")
maven
`maven-publish`
}

Expand Down
1 change: 0 additions & 1 deletion codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ plugins {
kotlin("jvm")
id("org.jetbrains.dokka")
jacoco
maven
`maven-publish`
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ kotlin.code.style=official
smithyVersion=1.21.0

# kotlin
kotlinVersion=1.6.20
kotlinVersion=1.6.21

# testing/utility
ktlintVersion=0.45.2
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 1 addition & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit edb1394

Please sign in to comment.