Merge develop into master

Author: kobylynskyi

.github/dependabot.yml

@@ -4,70 +4,70 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/graphql-java-codegen-gradle-plugin/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "maven"
     directory: "plugins/maven/graphql-java-codegen-maven-plugin/"
     schedule:
       interval: "weekly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/example-client/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/example-server/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "gradle"
     directory: "plugins/gradle/example-client-kotlin/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "maven"
     directory: "plugins/maven/example-client/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "maven"
     directory: "plugins/maven/example-server/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "monthly"
-    target-branch: "develop"
+    target-branch: "main"
     reviewers:
       - "kobylynskyi"

.github/workflows/check-code-style.yml

@@ -3,19 +3,17 @@ name: Check Code Style
 on:
   push:
     branches:
-      - master
-      - develop
+      - main
   pull_request:
     branches:
-      - master
-      - develop
+      - main
 
 jobs:
   check-code-style:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # brew install sbt; cd graphql-java-codegen-sbt-plugin; sbt fmt or sbt check
       - name: Check Scala Code Style

.github/workflows/github.yml

@@ -3,41 +3,40 @@ name: Build
 on:
   push:
     branches:
-      - master
-      - develop
+      - main
   pull_request:
     branches:
-      - master
-      - develop
+      - main
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk-version: [ 1.8 ]
+        jdk-version: [ 8, 11, 17 ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup Java ${{ matrix.jdk-version }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk-version }}
+          distribution: 'adopt'
 
       - name: Gradle cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle
           key: gradle
 
       - name: Maven cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: m2
 
       - name: Loading ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
@@ -82,30 +81,31 @@ jobs:
 
   sonar:
     needs: build
-    if: github.event_name != 'pull_request'    
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v3
+        with:
+         fetch-depth: 0
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'adopt'
 
       - name: Gradle cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle
           key: gradle
 
       - name: Maven cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: m2
 
       - name: Loading ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
@@ -118,5 +118,4 @@ jobs:
       - name: Generate and publish Sonar report
         run: ./gradlew sonarqube -Dsonar.projectKey=kobylynskyi_graphql-java-codegen -Dsonar.organization=kobylynskyi -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} --stacktrace
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}           
-          
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
         required: true
       release_branch:
         description: 'Release branch'
-        default: 'master'
+        default: 'main'
         required: true
       publish_library:
         description: 'Publish library'
@@ -32,29 +32,30 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.release_branch }}
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 1.8
+          distribution: 'adopt'
 
       - name: Gradle cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle
           key: gradle
 
       - name: Maven cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.m2
           key: m2
 
       - name: Loading ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}

.github/workflows/update-version.yml

@@ -11,7 +11,7 @@ jobs:
   update-version:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update version of Maven plugin sub-project
         working-directory: plugins/maven/graphql-java-codegen-maven-plugin

CONTRIBUTING.md

@@ -17,7 +17,7 @@ Please follow the steps below in order to make the changes:
 
 1. Clone the repository
 2. Set the local java version to 1.8
-3. Checkout **develop** branch.
+3. Checkout **main** branch.
 4. Open repository in your favourite IDE.
 5. Enable and configure CheckStyle plugin in your IDE (for IntelliJ it is CheckStyle-IDEA).
    Import [graphql-codegen-check-style.xml](config/checkstyle/graphql-codegen-check-style.xml) as a .

build.gradle

@@ -6,28 +6,27 @@ plugins {
     id "java-library"
     id "signing"
     id "maven-publish"
-    id "org.sonarqube" version "3.2.0"
+    id "org.sonarqube" version "4.0.0.2929"
 }
 
-def graphqlCodegenVersion = '5.7.1' // This variable used in the automatic release process
+def graphqlCodegenVersion = '5.7.2-SNAPSHOT' // This variable used in the automatic release process
 
 group = "io.github.kobylynskyi"
 version = graphqlCodegenVersion
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
     compileOnly "org.freemarker:freemarker:2.3.31"
-    compileOnly "com.graphql-java:graphql-java:20.0"
+    compileOnly "com.graphql-java:graphql-java:20.1"
     compileOnly "com.fasterxml.jackson.core:jackson-databind:2.14.2"
-    compileOnly "com.typesafe:config:1.4.1"
+    compileOnly "com.typesafe:config:1.4.2"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
     testImplementation "org.hamcrest:java-hamcrest:2.0.0.0"
 }
 
@@ -39,15 +38,14 @@ task codeCoverageReport(type: JacocoReport) {
     sourceSets sourceSets.main
 
     reports {
-        xml.enabled true
-        xml.destination file("${buildDir}/reports/jacoco/report.xml")
-        html.enabled false
-        csv.enabled false
+        html.required = false
+        csv.required = false
+        xml.destination = file("${buildDir}/reports/jacoco/report.xml")
     }
 }
 
 configurations {
-    testCompile.extendsFrom compileOnly
+    testImplementation.extendsFrom compileOnly
 }
 
 test {
@@ -102,7 +100,7 @@ publishing {
                 licenses {
                     license {
                         name = "MIT License"
-                        url = "https://github.com/kobylynskyi/graphql-java-codegen/blob/master/LICENSE"
+                        url = "https://github.com/kobylynskyi/graphql-java-codegen/blob/main/LICENSE"
                         distribution = "repo"
                     }
                 }

docs/migration-to-2.0.0.md

@@ -6,8 +6,8 @@ version 1.x.x then please follow steps below.
 
 ### 1. Update plugin and library versions
 
-As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle)
-, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven)
+As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle)
+, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven)
 
 ### 2. Update plugin configuration (only for client-side codegen)
 

docs/migration-to-3.0.0.md

@@ -7,8 +7,8 @@ follow [2.0.0 migration guide](migration-to-2.0.0.md) first.
 
 ### 1. Update plugin and library versions
 
-As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle)
-, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven)
+As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle)
+, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven)
 
 ### 2. Remove `generateAsyncApis` and rename `apiAsyncReturnType`/`apiAsyncReturnListType`
 

docs/migration-to-4.0.0.md

@@ -7,8 +7,8 @@ follow [3.0.0 migration guide](migration-to-3.0.0.md) first.
 
 ### 1. Update plugin and library versions
 
-As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle)
-, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/maven)
+As per plugin description: [Gradle](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/gradle)
+, [Maven](https://github.com/kobylynskyi/graphql-java-codegen/tree/main/plugins/maven)
 
 ### 2. Change GraphQL Resolvers containing non-null GraphQL types to primitive Java types