Skip to content

Commit c13dc41

Browse files
authored
Upgrades gradle to 9.1.0 (#2320)
This supports java 25
1 parent a52d7ae commit c13dc41

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,25 @@ ext {
2525

2626
project.version = findProperty('verifierVersion')
2727
apply plugin: 'groovy'
28+
apply plugin: 'java'
2829
apply plugin: "java-gradle-plugin"
2930
apply from: "$rootDir/gradle/release.gradle"
3031
//apply plugin: "jacoco"
3132

3233
group = 'org.springframework.cloud'
3334

34-
sourceCompatibility = 17
35-
targetCompatibility = 17
36-
3735
repositories {
3836
mavenLocal()
3937
mavenCentral()
4038
maven { url "https://repo.spring.io/snapshot" }
4139
maven { url "https://repo.spring.io/milestone" }
4240
}
4341

42+
tasks.withType(JavaCompile).configureEach {
43+
sourceCompatibility = JavaVersion.VERSION_17
44+
targetCompatibility = JavaVersion.VERSION_17
45+
}
46+
4447
//Dependencies in all subprojects - https://solidsoft.wordpress.com/2014/11/13/gradle-tricks-display-dependencies-for-all-subprojects-in-multi-project-build/
4548
task allDeps(type: DependencyReportTask) {}
4649
task allInsight(type: DependencyInsightReportTask) {}

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.gradle.api.file.Directory
2121
import org.gradle.api.internal.project.DefaultProject
2222
import org.gradle.api.plugins.GroovyPlugin
2323
import org.gradle.api.plugins.JavaPlugin
24-
import org.gradle.api.plugins.JavaPluginConvention
24+
import org.gradle.api.plugins.JavaPluginExtension
2525
import org.gradle.api.publish.PublicationContainer
2626
import org.gradle.api.publish.PublishingExtension
2727
import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
@@ -61,7 +61,7 @@ class ContractVerifierTest {
6161
given:
6262
ContractVerifierExtension extension = project.extensions.getByType(ContractVerifierExtension)
6363
Directory projectDir = project.layout.projectDirectory
64-
SourceSet contractTest = project.convention.getPlugin(JavaPluginConvention).getSourceSets().getByName("contractTest")
64+
SourceSet contractTest = project.extensions.findByType(JavaPluginExtension).getSourceSets().getByName("contractTest")
6565

6666
expect:
6767
assert contractTest != null
@@ -77,7 +77,7 @@ class ContractVerifierTest {
7777
project.plugins.apply(GroovyPlugin)
7878
ContractVerifierExtension extension = project.extensions.getByType(ContractVerifierExtension)
7979
Directory projectDir = project.layout.projectDirectory
80-
SourceSet contractTest = project.convention.getPlugin(JavaPluginConvention).getSourceSets().getByName("contractTest")
80+
SourceSet contractTest = project.extensions.getByType(JavaPluginExtension).getSourceSets().getByName("contractTest")
8181

8282
expect:
8383
assert contractTest != null

0 commit comments

Comments
 (0)