Skip to content

Commit 9b545fc

Browse files
committed
Upgrade to Gradle 9.0.0
1 parent c79829d commit 9b545fc

7 files changed

Lines changed: 14 additions & 20 deletions

File tree

build.gradle.kts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,12 @@ plugins {
88
idea
99
}
1010

11-
task("addGitHooks") {
11+
tasks.register<Copy>("addGitHooks") {
1212
onlyIf("unix") {
1313
!Os.isFamily(Os.FAMILY_WINDOWS)
1414
}
15-
doLast {
16-
exec {
17-
commandLine("ln", "-s", "-f", "../../git-hooks/pre-push", ".git/hooks/pre-push")
18-
}
19-
exec {
20-
commandLine("ln", "-s", "-f", "../../git-hooks/pre-commit", ".git/hooks/pre-commit")
21-
}
22-
println("Git hooks added")
23-
}
15+
from(File(rootProject.rootDir, "git-hooks"))
16+
into(File(rootProject.rootDir, ".git/hooks"))
2417
}
2518

2619
val smithyJavaVersion = project.file("VERSION").readText().replace(System.lineSeparator(), "")

buildSrc/src/main/kotlin/smithy-java.module-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ tasks.withType<Javadoc>() {
4343
// Include an Automatic-Module-Name in all JARs.
4444
afterEvaluate {
4545
val moduleName: String by extra
46-
tasks.withType<Jar>() {
46+
tasks.withType<Jar> {
4747
metaInf.with(licenseSpec)
4848
inputs.property("moduleName", moduleName)
4949
manifest {

codegen/plugins/client-codegen/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ dependencies {
1717

1818
addGenerateSrcsTask("software.amazon.smithy.java.codegen.client.TestServerJavaClientCodegenRunner")
1919

20+
tasks.test {
21+
failOnNoDiscoveredTests = false
22+
}
23+
2024
sourceSets {
2125
it {
2226
// Add test plugin to classpath

codegen/plugins/server-codegen/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ dependencies {
1111
implementation(project(":server:server-core"))
1212
}
1313

14+
tasks.test {
15+
failOnNoDiscoveredTests = false
16+
}
17+
1418
addGenerateSrcsTask("software.amazon.smithy.java.codegen.server.TestServerJavaCodegenRunner")

examples/mcp-server/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ repositories {
4545
}
4646

4747
tasks.shadowJar {
48-
val shadePrefix = "software.amazon.smithy.java.internal"
49-
relocate("com.jsoniter", "$shadePrefix.jsoniter")
50-
relocate("com.fasterxml.jackson", "$shadePrefix.com.fasterxml.jackson")
51-
relocate("META-INF/native/libnetty", "META-INF/native/lib${shadePrefix.replace('.', '_')}_netty")
52-
relocate("META-INF/native/netty", "META-INF/native/${shadePrefix.replace('.', '_')}_netty")
53-
exclude("META-INF/maven/**")
5448
mergeServiceFiles()
5549
transform(AppendingTransformer::class.java) {
5650
resource = "META-INF/smithy/manifest"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ include(":aws:aws-auth-api")
8181
// AWS service bundling code
8282
include(":aws:aws-service-bundle")
8383
include(":aws:aws-service-bundler")
84-
include(":aws:aws-mcp-provider")
8584
include(":aws:aws-mcp-types")
8685
include(":aws:aws-mcp-cli-commands")
8786

0 commit comments

Comments
 (0)