diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d80d5ef..42f43cf 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -13,10 +13,10 @@ jobs: MAVEN_CENTRAL_PGP_KEY: ${{ secrets.MAVEN_CENTRAL_PGP_KEY }} steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 31499de..80cb5ac 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -14,10 +14,10 @@ jobs: buildAndTest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6de60e8..9d2a133 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,10 +17,10 @@ jobs: RELEASE_VERSION: ${{ github.event.inputs.version }} steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v2 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'corretto' diff --git a/README.md b/README.md index ac1cad1..cd199f7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Extended Scalars for graphql-java [![Build Status](https://github.com/graphql-java/graphql-java-extended-scalars/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java-extended-scalars/actions/workflows/master.yml) -[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?versionPrefix=20.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) +[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?versionPrefix=22.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) [![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-extended-scalars?label=maven-central%20snapshot)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java-extended-scalars/) [![MIT licensed](https://img.shields.io/badge/license-MIT-green)](https://github.com/graphql-java/graphql-java-extended-scalars/blob/master/LICENSE.md) @@ -23,7 +23,7 @@ You would use custom scalars when you want to describe more meaningful behavior To use this library put the following into your gradle config ```java -implementation 'com.graphql-java:graphql-java-extended-scalars:20.2' +implementation 'com.graphql-java:graphql-java-extended-scalars:22.0' ``` or the following into your Maven config @@ -32,15 +32,18 @@ or the following into your Maven config com.graphql-java graphql-java-extended-scalars - 20.2 + 22.0 ``` > Note: > -> use 19.0 or above for graphql-java 19.x and above +> use 22.0 or above for graphql-java 22.x and above +> +> use 21.0 for graphql-java 21.x > -> use 20.0 or above for graphql-java 20.x and above +> use 20.2 for graphql-java 20.x +> ## How to use extended scalars @@ -68,7 +71,11 @@ public class GraphQlConfig { ### Netflix DGS -If you are using [Netflix DGS](https://netflix.github.io/dgs), please see their [configuration documentation](https://netflix.github.io/dgs/configuration/#dgs-extended-scalars-graphql-dgs-extended-scalars). +Note: Netflix also wraps this library in `com.netflix.graphql.dgs:graphql-dgs-extended-scalars` for [automatic registration](https://netflix.github.io/dgs/scalars/#automatically-register-scalar-extensions-via-graphql-dgs-extended-scalars). + +If you are using [Netflix DGS](https://netflix.github.io/dgs), please see the following docs: + - [registration through runtime wiring](https://netflix.github.io/dgs/scalars/#register-scalar-extensions-via-dgsruntimewiring) + - [configuration documentation](https://netflix.github.io/dgs/configuration/#dgs-extended-scalars-graphql-dgs-extended-scalars) ## How to add extended scalars to your schema diff --git a/build.gradle b/build.gradle index f67e126..da51065 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'java-library' id 'maven-publish' id 'signing' - id "io.github.gradle-nexus.publish-plugin" version "1.0.0" + id "io.github.gradle-nexus.publish-plugin" version "1.3.0" id "biz.aQute.bnd.builder" version "6.4.0" } @@ -41,10 +41,10 @@ repositories { } dependencies { - implementation "com.graphql-java:graphql-java:21.0" + implementation "com.graphql-java:graphql-java:22.0" - testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' - testImplementation('org.codehaus.groovy:groovy:2.5.13') + testImplementation "org.spockframework:spock-core:2.3-groovy-3.0" + testImplementation "org.codehaus.groovy:groovy:3.0.20" } task sourcesJar(type: Jar, dependsOn: classes) { @@ -63,6 +63,7 @@ artifacts { } test { + useJUnitPlatform() testLogging { exceptionFormat = 'full' }