Merge pull request #102 from graphql-java-kickstart/feature/deps-12

(deps) Update samples to use latest java libraries

Author: setchy

.github/workflows/master.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 11
       - name: Cache Gradle
         uses: actions/cache@v2
@@ -51,7 +51,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 11
       - name: Cache SonarCloud packages
         uses: actions/cache@v2

.github/workflows/pull-request.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        java: [ 11, 14 ]
+        java: [ 11, 17 ]
     needs: validation
     runs-on: ${{ matrix.os }}
     steps:
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Make gradlew executable (non-Windows only)
         if: matrix.os != 'windows-latest'

directives/build.gradle

@@ -3,7 +3,7 @@ apply from: "../spring-boot-commons.gradle"
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "com.graphql-java-kickstart:graphql-spring-boot-starter:$LIB_GRAPHQL_SPRING_BOOT_VER"
-    implementation 'com.graphql-java:graphql-java-extended-validation:16.0.0'
+    implementation "com.graphql-java:graphql-java-extended-validation:$LIB_GRAPHQL_EXTENDED_VALIDATION_VER"
 
     compileOnly "org.projectlombok:lombok"
     annotationProcessor "org.projectlombok:lombok"

directives/src/main/java/directives/RangeDirective.java

@@ -95,8 +95,8 @@ private DataFetcher createDataFetcher(DataFetcher originalFetcher) {
   private List<GraphQLError> apply(
       GraphQLDirectiveContainer it, DataFetchingEnvironment env, Object value) {
     GraphQLDirective directive = it.getDirective("range");
-    double min = (double) directive.getArgument("min").getValue();
-    double max = (double) directive.getArgument("max").getValue();
+    double min = (double) directive.getArgument("min").getArgumentValue().getValue();
+    double max = (double) directive.getArgument("max").getArgumentValue().getValue();
 
     if (value instanceof Double && ((double) value < min || (double) value > max)) {
       return singletonList(

gradle.properties

@@ -1,6 +1,7 @@
-LIB_GRAPHQL_SERVLET_VER=11.1.1
-LIB_GRAPHQL_SPRING_BOOT_VER=12.0.0-SNAPSHOT
-LIB_GRAPHQL_TOOLS_VER=11.0.1
+LIB_GRAPHQL_SERVLET_VER=12.0.0
+LIB_GRAPHQL_SPRING_BOOT_VER=12.0.0
+LIB_GRAPHQL_TOOLS_VER=12.0.1
+LIB_GRAPHQL_EXTENDED_VALIDATION_VER=17.0-hibernate-validator-6.2.0.Final
 LIB_SPRING_BOOT_VER=2.5.3
 sourceCompatibility=11
 targetCompatibility=11

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists