Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Gradle 7 #1411

Merged
merged 2 commits into from
Jun 23, 2022
Merged

Upgrade to Gradle 7 #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11254c4
Upgrade to Gradle 7
rcoh May 25, 2022
c3ecad5
Document the upgrade and update changelogs
rcoh Jun 23, 2022
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
7 changes: 6 additions & 1 deletion CHANGELOG.next.toml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
7 changes: 1 addition & 6 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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