Skip to content

Commit eee07a8

Browse files
jnizetwilkinsona
authored andcommitted
Move away from deprecated Gradle configurations
Closes gh-14593
1 parent 1d49352 commit eee07a8

10 files changed

+17
-18
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ repositories {
2121
}
2222

2323
dependencies {
24-
compile localGroovy()
25-
compile gradleApi()
26-
compile fileTree(dir: 'target/dependencies/compile', include: '*.jar')
27-
testCompile gradleTestKit()
28-
testCompile 'org.apache.commons:commons-compress:1.13'
29-
testCompile fileTree(dir: 'target/dependencies/test', include: '*.jar')
24+
implementation localGroovy()
25+
implementation gradleApi()
26+
implementation fileTree(dir: 'target/dependencies/compile', include: '*.jar')
27+
testImplementation gradleTestKit()
28+
testImplementation 'org.apache.commons:commons-compress:1.13'
29+
testImplementation fileTree(dir: 'target/dependencies/test', include: '*.jar')
3030
}
3131

3232
jar {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/managing-dependencies/dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
1313

1414
// tag::dependencies[]
1515
dependencies {
16-
compile 'org.springframework.boot:spring-boot-starter-web'
17-
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
16+
implementation 'org.springframework.boot:spring-boot-starter-web'
17+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
1818
}
1919
// end::dependencies[]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/boot-jar-requires-unpack.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repositories {
1212
}
1313

1414
dependencies {
15-
runtime 'org.jruby:jruby-complete:1.7.25'
15+
runtimeOnly 'org.jruby:jruby-complete:1.7.25'
1616
}
1717

1818
bootJar {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/gradle/packaging/war-container-dependency.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
1313

1414
// tag::dependencies[]
1515
dependencies {
16-
compile 'org.springframework.boot:spring-boot-starter-web'
16+
implementation 'org.springframework.boot:spring-boot-starter-web'
1717
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
1818
}
1919
// end::dependencies[]

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ public void noKotlinVersionPropertyWithoutKotlinPlugin() {
4444

4545
@Test
4646
public void kotlinVersionMatchesKotlinPluginVersion() {
47-
String output = this.gradleBuild
48-
.build("kotlinVersion", "dependencies", "--configuration", "compile")
49-
.getOutput();
47+
String output = this.gradleBuild.build("kotlinVersion", "dependencies",
48+
"--configuration", "compileClasspath").getOutput();
5049
assertThat(output).contains("Kotlin version: 1.2.10");
5150
assertThat(output)
5251
.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10");

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/DependencyManagementPluginActionIntegrationTests-helpfulErrorWhenVersionlessDependencyFailsToResolve.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ repositories {
1212
}
1313

1414
dependencies {
15-
compile 'org.springframework.boot:spring-boot-starter-web'
15+
implementation 'org.springframework.boot:spring-boot-starter-web'
1616
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-additionalMetadataLocationsConfiguredWhenProcessorIsPresent.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repositories {
1212
}
1313

1414
dependencies {
15-
def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'compile'
15+
def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'implementation'
1616
add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3'])
1717
}
1818

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/KotlinPluginActionIntegrationTests-kotlinVersionMatchesKotlinPluginVersion.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ repositories {
2828
}
2929

3030
dependencies {
31-
compile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
31+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
3232
}
3333

3434
task kotlinVersion {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/SpringBootPluginIntegrationTests-unresolvedDependenciesAreAnalyzedWhenDependencyResolutionFails.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ repositories {
1212
}
1313

1414
dependencies {
15-
compile 'org.springframework.boot:spring-boot-starter'
15+
implementation 'org.springframework.boot:spring-boot-starter'
1616
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-duplicatesAreHandledGracefully.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ repositories {
2626
}
2727

2828
dependencies {
29-
compile "org.apache.commons:commons-lang3:3.6"
29+
implementation "org.apache.commons:commons-lang3:3.6"
3030
provided "org.apache.commons:commons-lang3:3.6"
3131
}

0 commit comments

Comments
 (0)