Move away from deprecated Gradle configurations

Closes gh-14593
pull/14639/merge
jnizet 6 years ago committed by Andy Wilkinson
parent 1d49352778
commit eee07a840f

@ -21,12 +21,12 @@ repositories {
}
dependencies {
compile localGroovy()
compile gradleApi()
compile fileTree(dir: 'target/dependencies/compile', include: '*.jar')
testCompile gradleTestKit()
testCompile 'org.apache.commons:commons-compress:1.13'
testCompile fileTree(dir: 'target/dependencies/test', include: '*.jar')
implementation localGroovy()
implementation gradleApi()
implementation fileTree(dir: 'target/dependencies/compile', include: '*.jar')
testImplementation gradleTestKit()
testImplementation 'org.apache.commons:commons-compress:1.13'
testImplementation fileTree(dir: 'target/dependencies/test', include: '*.jar')
}
jar {

@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
// tag::dependencies[]
dependencies {
compile 'org.springframework.boot:spring-boot-starter-web'
compile 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
}
// end::dependencies[]

@ -12,7 +12,7 @@ repositories {
}
dependencies {
runtime 'org.jruby:jruby-complete:1.7.25'
runtimeOnly 'org.jruby:jruby-complete:1.7.25'
}
bootJar {

@ -13,7 +13,7 @@ apply plugin: 'io.spring.dependency-management'
// tag::dependencies[]
dependencies {
compile 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-web'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
}
// end::dependencies[]

@ -44,9 +44,8 @@ public class KotlinPluginActionIntegrationTests {
@Test
public void kotlinVersionMatchesKotlinPluginVersion() {
String output = this.gradleBuild
.build("kotlinVersion", "dependencies", "--configuration", "compile")
.getOutput();
String output = this.gradleBuild.build("kotlinVersion", "dependencies",
"--configuration", "compileClasspath").getOutput();
assertThat(output).contains("Kotlin version: 1.2.10");
assertThat(output)
.containsPattern("org.jetbrains.kotlin:kotlin-stdlib-jdk8:* -> 1.2.10");

@ -12,5 +12,5 @@ repositories {
}
dependencies {
compile 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-web'
}

@ -12,7 +12,7 @@ repositories {
}
dependencies {
def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'compile'
def configurationName = GradleVersion.current().compareTo(GradleVersion.version("4.6")) >= 0 ? 'annotationProcessor': 'implementation'
add(configurationName, [name: 'spring-boot-configuration-processor-1.2.3'])
}

@ -28,7 +28,7 @@ repositories {
}
dependencies {
compile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
}
task kotlinVersion {

@ -12,5 +12,5 @@ repositories {
}
dependencies {
compile 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter'
}

@ -26,6 +26,6 @@ repositories {
}
dependencies {
compile "org.apache.commons:commons-lang3:3.6"
implementation "org.apache.commons:commons-lang3:3.6"
provided "org.apache.commons:commons-lang3:3.6"
}

Loading…
Cancel
Save