Skip to content

Commit 8151473

Browse files
kobylynskyikobylynskyi
authored
Update all dependencies and test on Java 11 and 17 #1063 (#1114)
1 parent d154ef9 commit 8151473

File tree

12 files changed

+68
-72
lines changed

12 files changed

+68
-72
lines changed

‎.github/workflows/github.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- master
77
- develop
8+
- java-11-17
89
pull_request:
910
branches:
1011
- master
@@ -15,7 +16,7 @@ jobs:
1516
runs-on: ubuntu-latest
1617
strategy:
1718
matrix:
18-
jdk-version: [ 1.8 ]
19+
jdk-version: [ 8, 11, 17 ]
1920
steps:
2021
- uses: actions/checkout@v2
2122

‎build.gradle‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id "java-library"
77
id "signing"
88
id "maven-publish"
9-
id "org.sonarqube" version "3.2.0"
9+
id "org.sonarqube" version "4.0.0.2929"
1010
}
1111

1212
def graphqlCodegenVersion = '5.7.2-SNAPSHOT' // This variable used in the automatic release process
@@ -16,18 +16,17 @@ version = graphqlCodegenVersion
1616

1717
repositories {
1818
mavenCentral()
19-
jcenter()
2019
}
2120

2221
dependencies {
2322
compileOnly "org.freemarker:freemarker:2.3.31"
24-
compileOnly "com.graphql-java:graphql-java:20.0"
23+
compileOnly "com.graphql-java:graphql-java:20.1"
2524
compileOnly "com.fasterxml.jackson.core:jackson-databind:2.14.2"
26-
compileOnly "com.typesafe:config:1.4.1"
25+
compileOnly "com.typesafe:config:1.4.2"
2726

28-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
29-
testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
30-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
27+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
28+
testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
29+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
3130
testImplementation "org.hamcrest:java-hamcrest:2.0.0.0"
3231
}
3332

@@ -39,15 +38,14 @@ task codeCoverageReport(type: JacocoReport) {
3938
sourceSets sourceSets.main
4039

4140
reports {
42-
xml.enabled true
43-
xml.destination file("${buildDir}/reports/jacoco/report.xml")
44-
html.enabled false
45-
csv.enabled false
41+
html.required = false
42+
csv.required = false
43+
xml.destination = file("${buildDir}/reports/jacoco/report.xml")
4644
}
4745
}
4846

4947
configurations {
50-
testCompile.extendsFrom compileOnly
48+
testImplementation.extendsFrom compileOnly
5149
}
5250

5351
test {

‎gradle/wrapper/gradle-wrapper.properties‎

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-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎plugins/gradle/example-client-kotlin/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ def graphqlCodegenClientKotlinVersion = '5.7.2-SNAPSHOT' // Variable used in the
1212
group = 'io.github.dreamylost'
1313
version = graphqlCodegenClientKotlinVersion
1414

15-
sourceCompatibility = 1.8
16-
1715
sourceSets {
1816
main.kotlin.srcDirs += "$buildDir/generated-server"
1917
}
@@ -24,21 +22,24 @@ repositories {
2422
}
2523
mavenCentral()
2624
mavenLocal()
27-
jcenter()
2825
}
2926

3027

3128
dependencies {
29+
// use the latest available version:
30+
// https://search.maven.org/artifact/io.github.kobylynskyi/graphql-java-codegen
3231
implementation "io.github.kobylynskyi:graphql-java-codegen:5.7.2-SNAPSHOT"
32+
3333
implementation "javax.validation:validation-api:2.0.1.Final"
3434
implementation "com.squareup.okhttp3:okhttp:4.2.2"
35-
implementation "com.fasterxml.jackson.core:jackson-core:2.13.3"
36-
implementation "com.fasterxml.jackson.core:jackson-databind:2.13.3"
37-
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3"
38-
implementation "com.fasterxml.jackson.core:jackson-annotations:2.13.3"
35+
implementation "com.fasterxml.jackson.core:jackson-core:2.14.2"
36+
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.2"
37+
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2"
38+
implementation "com.fasterxml.jackson.core:jackson-annotations:2.14.2"
3939
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
40-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
41-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
40+
41+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
42+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
4243
}
4344

4445
/**
@@ -66,4 +67,4 @@ task graphqlCodegenKotlinService(type: GraphQLCodegenGradleTask) {
6667
]
6768
modelNameSuffix = "TO"
6869
supportUnknownFields = true
69-
}
70+
}

‎plugins/gradle/example-client/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ dependencies {
2727
implementation "org.apache.httpcomponents:httpclient:4.5.13"
2828
implementation "javax.validation:validation-api:2.0.1.Final"
2929

30-
implementation "org.mapstruct:mapstruct:1.4.2.Final"
31-
annotationProcessor "org.mapstruct:mapstruct-processor:1.4.2.Final"
30+
implementation "org.mapstruct:mapstruct:1.5.3.Final"
31+
annotationProcessor "org.mapstruct:mapstruct-processor:1.5.3.Final"
3232

33-
compileOnly "org.projectlombok:lombok:1.18.18"
34-
annotationProcessor "org.projectlombok:lombok:1.18.12"
33+
compileOnly "org.projectlombok:lombok:1.18.26"
34+
annotationProcessor "org.projectlombok:lombok:1.18.26"
3535

3636
testImplementation "io.rest-assured:rest-assured:4.3.3"
37-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
38-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
37+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
38+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
3939
}
4040

4141

‎plugins/gradle/example-server/build.gradle‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ dependencies {
2121

2222
implementation "javax.validation:validation-api:2.0.1.Final"
2323

24-
implementation "org.mapstruct:mapstruct:1.4.2.Final"
25-
annotationProcessor "org.mapstruct:mapstruct-processor:1.4.2.Final"
24+
compileOnly "org.projectlombok:lombok:1.18.26"
25+
annotationProcessor "org.projectlombok:lombok:1.18.26"
2626

27-
compileOnly "org.projectlombok:lombok:1.18.18"
28-
annotationProcessor "org.projectlombok:lombok:1.18.12"
27+
implementation 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
28+
29+
implementation "org.mapstruct:mapstruct:1.5.3.Final"
30+
annotationProcessor "org.mapstruct:mapstruct-processor:1.5.3.Final"
2931
}
3032

3133
compileJava.dependsOn "graphqlCodegen"

‎plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.plugin-publish" version "0.14.0"
2+
id "com.gradle.plugin-publish" version "1.1.0"
33
id "java-gradle-plugin"
44
}
55

@@ -9,7 +9,6 @@ repositories {
99
}
1010
mavenCentral()
1111
mavenLocal()
12-
jcenter()
1312
}
1413

1514
apply plugin: "java"
@@ -28,28 +27,24 @@ dependencies {
2827
implementation "io.github.kobylynskyi:graphql-java-codegen:${version}"
2928

3029
implementation "org.freemarker:freemarker:2.3.31"
31-
implementation "com.graphql-java:graphql-java:16.2"
32-
implementation "com.fasterxml.jackson.core:jackson-databind:2.13.3"
30+
implementation "com.graphql-java:graphql-java:20.1"
31+
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.2"
3332
implementation "com.typesafe:config:1.4.1"
3433

35-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
36-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
34+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
35+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
3736
}
3837

3938
gradlePlugin {
39+
website = 'https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle/graphql-java-codegen-gradle-plugin'
40+
vcsUrl = 'https://github.com/kobylynskyi/graphql-java-codegen'
4041
plugins {
4142
graphqlCodegen {
4243
id = 'io.github.kobylynskyi.graphql.codegen'
4344
displayName = 'GraphQL Java Codegen'
44-
description = project.description
45+
description = 'Gradle plugin for GraphQL Java code generation'
4546
implementationClass = 'io.github.kobylynskyi.graphql.codegen.gradle.GraphQLCodegenGradlePlugin'
47+
tags.set(['graphql', 'graphql-java', 'graphql-java-codegen', 'graphql-codegen'])
4648
}
4749
}
4850
}
49-
50-
pluginBundle {
51-
website = 'https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle/graphql-java-codegen-gradle-plugin'
52-
vcsUrl = 'https://github.com/kobylynskyi/graphql-java-codegen'
53-
description = 'Gradle plugin for GraphQL Java code generation'
54-
tags = ['graphql', 'graphql-java', 'graphql-java-codegen', 'graphql-codegen']
55-
}

‎plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/resources/META-INF/gradle-plugins/io.github.kobylynskyi.graphql.codegen.properties‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎plugins/maven/example-client/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@
106106
<annotationProcessorPath>
107107
<groupId>org.projectlombok</groupId>
108108
<artifactId>lombok</artifactId>
109-
<version>1.18.12</version>
109+
<version>1.18.26</version>
110110
</annotationProcessorPath>
111111
<annotationProcessorPath>
112112
<groupId>org.mapstruct</groupId>
113113
<artifactId>mapstruct-processor</artifactId>
114-
<version>1.4.1.Final</version>
114+
<version>1.5.3.Final</version>
115115
</annotationProcessorPath>
116116
</annotationProcessorPaths>
117117
</configuration>
@@ -169,12 +169,12 @@
169169
<dependency>
170170
<groupId>org.mapstruct</groupId>
171171
<artifactId>mapstruct</artifactId>
172-
<version>1.4.2.Final</version>
172+
<version>1.5.3.Final</version>
173173
</dependency>
174174
<dependency>
175175
<groupId>org.projectlombok</groupId>
176176
<artifactId>lombok</artifactId>
177-
<version>1.18.18</version>
177+
<version>1.18.26</version>
178178
</dependency>
179179

180180
<dependency>
@@ -185,12 +185,12 @@
185185
<dependency>
186186
<groupId>org.junit.jupiter</groupId>
187187
<artifactId>junit-jupiter-api</artifactId>
188-
<version>5.7.1</version>
188+
<version>5.9.2</version>
189189
</dependency>
190190
<dependency>
191191
<groupId>org.junit.jupiter</groupId>
192192
<artifactId>junit-jupiter-engine</artifactId>
193-
<version>5.7.1</version>
193+
<version>5.9.2</version>
194194
</dependency>
195195
</dependencies>
196196

‎plugins/maven/example-server/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@
5959
<annotationProcessorPath>
6060
<groupId>org.projectlombok</groupId>
6161
<artifactId>lombok</artifactId>
62-
<version>1.18.12</version>
62+
<version>1.18.26</version>
6363
</annotationProcessorPath>
6464
<annotationProcessorPath>
6565
<groupId>org.mapstruct</groupId>
6666
<artifactId>mapstruct-processor</artifactId>
67-
<version>1.4.1.Final</version>
67+
<version>1.5.3.Final</version>
6868
</annotationProcessorPath>
6969
</annotationProcessorPaths>
7070
</configuration>
@@ -109,12 +109,12 @@
109109
<dependency>
110110
<groupId>org.mapstruct</groupId>
111111
<artifactId>mapstruct</artifactId>
112-
<version>1.4.2.Final</version>
112+
<version>1.5.3.Final</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>org.projectlombok</groupId>
116116
<artifactId>lombok</artifactId>
117-
<version>1.18.18</version>
117+
<version>1.18.26</version>
118118
</dependency>
119119
</dependencies>
120120

0 commit comments

Comments
 (0)