Skip to content

Commit 2e50ea7

Browse files
committed
Move plugin declarations to plugin syntax
Note: this syntax automatically applies the plugin to the root project. Adding `apply false` in the plugin declaration disables that. Issue: SPR-15885
1 parent 11418d8 commit 2e50ea7

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
buildscript {
2-
ext.kotlinVersion = '1.1.4'
32
repositories {
43
maven { url "https://repo.spring.io/plugins-release" }
54
}
65
dependencies {
7-
classpath("io.spring.gradle:dependency-management-plugin:1.0.0.RELEASE")
86
classpath("io.spring.gradle:propdeps-plugin:0.0.8")
97
classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
10-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
11-
classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3")
128
classpath("org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.14")
139
classpath("org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.6")
1410
}
1511
}
1612

13+
// 3rd party plugin repositories can be configured in settings.gradle
1714
plugins {
1815
id "com.gradle.build-scan" version "1.8"
16+
id "io.spring.dependency-management" version "1.0.3.RELEASE" apply false
17+
id "org.jetbrains.kotlin.jvm" version "1.1.4" apply false
18+
id "org.asciidoctor.convert" version "1.5.3"
1919
id "org.sonarqube" version "2.5"
2020
}
2121

@@ -55,6 +55,7 @@ configure(allprojects) { project ->
5555
ext.junitJupiterVersion = '5.0.0-RC2'
5656
ext.junitPlatformVersion = '1.0.0-RC2'
5757
ext.junitVintageVersion = "4.12.0-RC2"
58+
ext.kotlinVersion = '1.1.4'
5859
ext.log4jVersion = '2.8.2'
5960
ext.nettyVersion = "4.1.14.Final"
6061
ext.okhttp3Version = "3.8.1"

gradle/docs.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
apply plugin: "org.asciidoctor.convert"
18-
1917
asciidoctor {
2018
sources {
2119
include '*.adoc'

settings.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
pluginManagement {
3+
repositories {
4+
maven {
5+
url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
6+
}
7+
gradlePluginPortal()
8+
}
9+
}
10+
*/
11+
112
include "spring-aop"
213
include "spring-aspects"
314
include "spring-beans"

0 commit comments

Comments
 (0)