Skip to content

Commit 998362b

Browse files
committed
feat(core): switch to new gradle plugin mechanism
1 parent c6cb1ca commit 998362b

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

build.gradle.kts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,50 +20,54 @@ allprojects {
2020
}
2121

2222
buildscript {
23-
24-
val kotlinVersion = "1.1.3-2"
2523
val springBootVersion = "2.0.0.M2"
26-
val gradleNodePluginVersion = "1.2.0"
27-
val dependencyManagementVersion = "1.0.3.RELEASE"
28-
val uptodatePluginVersion = "1.6.3"
29-
val gradleDockerPluginVersion = "3.0.12"
3024

31-
project.extra.set("kotlinVersion", kotlinVersion)
3225
project.extra.set("springBootVersion", springBootVersion)
3326

3427
repositories {
3528
mavenCentral()
36-
maven { setUrl("https://plugins.gradle.org/m2/") }
3729
maven { setUrl("https://repo.spring.io/milestone") }
3830
}
3931

4032
dependencies {
41-
classpath("com.ofg:uptodate-gradle-plugin:$uptodatePluginVersion")
42-
classpath("com.bmuschko:gradle-docker-plugin:$gradleDockerPluginVersion")
43-
classpath("io.spring.gradle:dependency-management-plugin:$dependencyManagementVersion")
44-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
4533
classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
46-
classpath("com.moowork.gradle:gradle-node-plugin:$gradleNodePluginVersion")
47-
classpath("org.jetbrains.kotlin:kotlin-noarg:$kotlinVersion")
48-
classpath("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
4934
}
5035

5136
}
5237

38+
plugins {
39+
val kotlinVersion = "1.1.3-2"
40+
val gradleNodePluginVersion = "1.2.0"
41+
val dependencyManagementVersion = "1.0.3.RELEASE"
42+
val uptodatePluginVersion = "1.6.3"
43+
val gradleDockerPluginVersion = "3.0.8"
44+
45+
id("io.spring.dependency-management") version dependencyManagementVersion
46+
id("org.jetbrains.kotlin.jvm") version kotlinVersion
47+
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
48+
id("org.jetbrains.kotlin.plugin.allopen") version kotlinVersion
49+
id("org.jetbrains.kotlin.plugin.noarg") version kotlinVersion
50+
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
51+
id("org.jetbrains.kotlin.kapt") version kotlinVersion
52+
id("com.moowork.node") version gradleNodePluginVersion
53+
id("com.bmuschko.docker-remote-api") version gradleDockerPluginVersion
54+
id("com.ofg.uptodate") version uptodatePluginVersion
55+
}
56+
5357
subprojects {
5458

5559
apply {
56-
plugin("io.spring.dependency-management")
57-
plugin("java")
58-
plugin("kotlin")
59-
plugin("kotlin-kapt")
60-
plugin("kotlin-allopen")
61-
plugin("kotlin-spring")
62-
plugin("kotlin-noarg")
63-
plugin("kotlin-jpa")
64-
plugin("jacoco")
6560
plugin("idea")
6661
plugin("eclipse")
62+
plugin("java")
63+
plugin("jacoco")
64+
plugin("io.spring.dependency-management")
65+
plugin("org.jetbrains.kotlin.jvm")
66+
plugin("org.jetbrains.kotlin.kapt")
67+
plugin("org.jetbrains.kotlin.plugin.allopen")
68+
plugin("org.jetbrains.kotlin.plugin.spring")
69+
plugin("org.jetbrains.kotlin.plugin.noarg")
70+
plugin("org.jetbrains.kotlin.plugin.jpa")
6771
plugin("com.ofg.uptodate")
6872
}
6973

@@ -111,7 +115,6 @@ subprojects {
111115
testLogging.exceptionFormat = TestExceptionFormat.FULL
112116
}
113117

114-
115118
configure<DependencyManagementExtension> {
116119
imports {
117120
val springBootVersion = parent.extra.get("springBootVersion")
@@ -120,19 +123,16 @@ subprojects {
120123
}
121124

122125
dependencies {
123-
124-
val kotlinVersion = parent.extra.get("kotlinVersion")
125126
val jacksonVersion = the<DependencyManagementExtension>().importedProperties["jackson.version"]
126127
val querydslVersion = the<DependencyManagementExtension>().importedProperties["querydsl.version"]
127128
val axonVersion = "3.0.5"
128129
val jjwtVersion = "0.7.0"
129130
val reflectionsVersion = "0.9.11"
130131

131-
132132
configurations.compile.exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
133133

134-
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion")
135-
compile("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
134+
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8")
135+
compile("org.jetbrains.kotlin:kotlin-reflect:")
136136

137137
compile("org.springframework.boot:spring-boot-devtools")
138138
compile("org.springframework.boot:spring-boot-starter-actuator")
@@ -165,8 +165,8 @@ subprojects {
165165
runtime("com.h2database:h2")
166166
runtime("org.postgresql:postgresql")
167167

168-
testCompile("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
169-
testCompile("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
168+
testCompile("org.jetbrains.kotlin:kotlin-test")
169+
testCompile("org.jetbrains.kotlin:kotlin-test-junit")
170170
testCompile("org.springframework.boot:spring-boot-starter-test")
171171
testCompile("org.springframework.security:spring-security-test")
172172
testCompile("org.reflections:reflections:$reflectionsVersion")

0 commit comments

Comments
 (0)