Skip to content

Commit 7266c1a

Browse files
donbeavedonbeave
committed
- Switch to use Version Catalog for Gradle plugins.
- Kotlin 1.6.21.
1 parent 8e42dd4 commit 7266c1a

File tree

8 files changed

+43
-41
lines changed

8 files changed

+43
-41
lines changed

‎build.gradle.kts‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,19 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
44
java
5-
6-
// https://plugins.gradle.org/plugin/com.adarshr.test-logger
7-
id("com.adarshr.test-logger") version "3.2.0" apply false
8-
9-
// https://plugins.gradle.org/plugin/com.tailrocks.spotless
10-
id("com.tailrocks.spotless") version "0.1.4"
11-
12-
// https://plugins.gradle.org/plugin/com.tailrocks.java
13-
id("com.tailrocks.java") version "0.1.4" apply false
14-
15-
// https://plugins.gradle.org/plugin/com.tailrocks.idea
16-
id("com.tailrocks.idea") version "0.1.3" apply false
17-
18-
// https://plugins.gradle.org/plugin/com.tailrocks.junit
19-
id("com.tailrocks.junit") version "0.1.5" apply false
20-
21-
// https://plugins.gradle.org/plugin/com.tailrocks.versions
22-
id("com.tailrocks.versions") version "0.1.4" apply false
23-
24-
// https://plugins.gradle.org/plugin/com.tailrocks.maven-publish
25-
id("com.tailrocks.maven-publish") version "0.1.6" apply false
26-
27-
// https://plugins.gradle.org/plugin/com.tailrocks.signing
28-
id("com.tailrocks.signing") version "0.1.3" apply false
29-
30-
kotlin("jvm") version libs.versions.kotlin.get() apply false
31-
kotlin("kapt") version libs.versions.kotlin.get() apply false
32-
kotlin("plugin.allopen") version libs.versions.kotlin.get() apply false
5+
alias(libs.plugins.test.logger) apply false
6+
alias(libs.plugins.tailrocks.spotless)
7+
alias(libs.plugins.tailrocks.java) apply false
8+
alias(libs.plugins.tailrocks.idea) apply false
9+
alias(libs.plugins.tailrocks.junit) apply false
10+
alias(libs.plugins.tailrocks.versions) apply false
11+
alias(libs.plugins.tailrocks.maven.publish) apply false
12+
alias(libs.plugins.tailrocks.signing) apply false
13+
alias(libs.plugins.kotlin.jvm) apply false
14+
alias(libs.plugins.kotlin.kapt) apply false
15+
alias(libs.plugins.kotlin.plugin.allopen) apply false
16+
alias(libs.plugins.spring.dependency.management) apply false
17+
alias(libs.plugins.spring.boot) apply false
3318
}
3419

3520
val projectVersion: String by project

‎gradle/libs.versions.toml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
# Libraries
3-
kotlin = "1.5.21"
3+
kotlin = "1.6.21"
44
groovy = "3.0.10"
55
junit = "5.8.2"
66
graphql-java = "18.1"
@@ -23,3 +23,18 @@ commons-text = { module = "org.apache.commons:commons-text", version.ref = "comm
2323
spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
2424
spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
2525
graphql-java = { module = "com.graphql-java:graphql-java", version.ref = "graphql-java" }
26+
27+
[plugins]
28+
test-logger = { id = "com.adarshr.test-logger", version = "3.2.0" }
29+
tailrocks-spotless = { id = "com.tailrocks.spotless", version = "0.1.4" }
30+
tailrocks-java = { id = "com.tailrocks.java", version = "0.1.4" }
31+
tailrocks-idea = { id = "com.tailrocks.idea", version = "0.1.3" }
32+
tailrocks-junit = { id = "com.tailrocks.junit", version = "0.1.5" }
33+
tailrocks-versions = { id = "com.tailrocks.versions", version = "0.1.4" }
34+
tailrocks-maven-publish = { id = "com.tailrocks.maven-publish", version = "0.1.6" }
35+
tailrocks-signing = { id = "com.tailrocks.signing", version = "0.1.3" }
36+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
37+
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
38+
kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" }
39+
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
40+
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot" }

‎gradle/repositoriesSettings.gradle.kts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ pluginManagement {
33
mavenLocal()
44
gradlePluginPortal()
55
mavenCentral()
6-
maven("https://repo.spring.io/milestone")
6+
7+
// uncomment if you need to use pre-release or snapshot versions
8+
//maven("https://repo.spring.io/milestone")
79
}
810
}
911

@@ -12,9 +14,9 @@ dependencyResolutionManagement {
1214
mavenLocal()
1315
mavenCentral()
1416
gradlePluginPortal()
15-
maven("https://repo.spring.io/milestone")
1617

17-
// uncomment if you need to use snapshot versions
18+
// uncomment if you need to use pre-release or snapshot versions
19+
//maven("https://repo.spring.io/milestone")
1820
//maven("https://oss.sonatype.org/content/repositories/snapshots")
1921
//maven("https://s01.oss.sonatype.org/content/repositories/snapshots")
2022
//maven("https://oss.jfrog.org/oss-snapshot-local")

‎graphql-datetime-spring-boot-starter/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(project(":graphql-datetime-spring-boot-autoconfigure"))
1414

1515
// Spring Boot
16-
api("org.springframework.boot:spring-boot-starter-graphql:2.7.0")
16+
api("org.springframework.boot:spring-boot-starter-graphql")
1717
}
1818

1919
tasks.withType<JavaCompile> {

‎samples/dgs-webmvc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
groovy
33
id("com.adarshr.test-logger")
4-
id("io.spring.dependency-management") version "1.0.11.RELEASE"
5-
id("org.springframework.boot") version "2.7.0"
4+
id("io.spring.dependency-management")
5+
id("org.springframework.boot")
66
}
77

88
the<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension>().apply {

‎samples/kickstart-webflux/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
groovy
33
id("com.adarshr.test-logger")
4-
id("io.spring.dependency-management") version "1.0.11.RELEASE"
5-
id("org.springframework.boot") version "2.7.0"
4+
id("io.spring.dependency-management")
5+
id("org.springframework.boot")
66
}
77

88
the<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension>().apply {

‎samples/kickstart-webmvc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
groovy
33
id("com.adarshr.test-logger")
4-
id("io.spring.dependency-management") version "1.0.11.RELEASE"
5-
id("org.springframework.boot") version "2.7.0"
4+
id("io.spring.dependency-management")
5+
id("org.springframework.boot")
66
}
77

88
the<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension>().apply {

‎samples/spring-boot-webmvc/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
groovy
33
id("com.adarshr.test-logger")
4-
id("io.spring.dependency-management") version "1.0.11.RELEASE"
5-
id("org.springframework.boot") version "2.7.0"
4+
id("io.spring.dependency-management")
5+
id("org.springframework.boot")
66
}
77

88
the<io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension>().apply {

0 commit comments

Comments
 (0)