Skip to content

Commit 2d3f0e2

Browse files
authored
Upgrade Gradle to 8.1 (aws-observability#644)
`./gradlew wrapper --gradle-version 8.1 --distribution-type all` Also, work through some deprecation warnings.
1 parent 76e2014 commit 2d3f0e2

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

java/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ allprojects {
88
plugins.apply("com.diffplug.spotless")
99

1010
plugins.withId("java") {
11-
configure<JavaPluginConvention> {
11+
configure<JavaPluginExtension> {
1212
sourceCompatibility = JavaVersion.VERSION_1_8
1313
targetCompatibility = JavaVersion.VERSION_1_8
1414
}

java/dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
}
3838

3939
fun isNonStable(version: String): Boolean {
40-
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
40+
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
4141
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
4242
val isGuava = version.endsWith("-jre")
4343
val isStable = stableKeyword || regex.matches(version) || isGuava
333 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
6+
distributionSha256Sum=2cbafcd2c47a101cb2165f636b4677fac0b954949c9429c1c988da399defe6a9

java/layer-javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tasks {
2828
from("scripts")
2929
}
3030

31-
val assemble by existing {
31+
named("assemble") {
3232
dependsOn(createLayer)
3333
}
3434
}

java/layer-wrapper/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ tasks {
3030
from("scripts")
3131
}
3232

33-
val assemble by existing {
33+
named("assemble") {
3434
dependsOn(createLayer)
3535
}
3636
}

0 commit comments

Comments
 (0)