Skip to content

Commit a031393

Browse files
Upgrade Gradle 7.4 → 8.12 with compatible plugin versions
- Update Gradle wrapper from 7.4 to 8.12 - Update Spotless plugin from 6.2.1 to 6.25.0 - Update DGS codegen plugin from 5.0.6 to 6.3.0 - Update Spring Boot plugin from 2.6.3 to 2.7.18 (minimum for Gradle 8) - Update dependency-management plugin from 1.0.11.RELEASE to 1.1.6 - Update DGS runtime from 4.9.21 to 5.5.1 (required by codegen 6.3.0) - Add DGS platform BOM and pin graphql-java 19.2 to prevent Spring Boot BOM from downgrading it to 18.x - Adapt PageInfo usage in ArticleDatafetcher and CommentDatafetcher to use the DGS-generated PageInfo type instead of graphql.relay.DefaultPageInfo All 68 tests pass.
1 parent c20e1f6 commit a031393

6 files changed

Lines changed: 184 additions & 140 deletions

File tree

build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.6.3'
3-
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
2+
id 'org.springframework.boot' version '2.7.18'
3+
id 'io.spring.dependency-management' version '1.1.6'
44
id 'java'
5-
id "com.netflix.dgs.codegen" version "5.0.6"
6-
id "com.diffplug.spotless" version "6.2.1"
5+
id "com.netflix.dgs.codegen" version "6.3.0"
6+
id "com.diffplug.spotless" version "6.25.0"
77
}
88

99
version = '0.0.1-SNAPSHOT'
@@ -31,12 +31,15 @@ configurations {
3131
}
3232

3333
dependencies {
34+
implementation platform('com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:5.5.1')
35+
// Force graphql-java 19.2 required by DGS 5.5.1 (Spring Boot BOM defaults to 18.x)
36+
implementation 'com.graphql-java:graphql-java:19.2'
3437
implementation 'org.springframework.boot:spring-boot-starter-web'
3538
implementation 'org.springframework.boot:spring-boot-starter-validation'
3639
implementation 'org.springframework.boot:spring-boot-starter-hateoas'
3740
implementation 'org.springframework.boot:spring-boot-starter-security'
3841
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
39-
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:4.9.21'
42+
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter'
4043
implementation 'org.flywaydb:flyway-core'
4144
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
4245
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2',

gradle/wrapper/gradle-wrapper.jar

618 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 153 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)