Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .github/workflows/check-code-style.yml

This file was deleted.

43 changes: 1 addition & 42 deletions .github/workflows/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk-version: [ 8, 11, 17 ]
jdk-version: [ 21 ]
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -79,44 +79,3 @@ jobs:
run: sbt scripted


sonar:
needs: build
if: github.event_name != 'pull_request'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'adopt'

- name: Gradle cache
uses: actions/cache@v4
with:
path: ~/.gradle
key: gradle

- name: Maven cache
uses: actions/cache@v4
with:
path: ~/.m2
key: m2

- name: Loading ivy cache
uses: actions/cache@v4
with:
path: ~/.ivy2/cache
key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
restore-keys: |
${{ runner.os }}-ivy-

- name: Generate code coverage report
run: ./gradlew codeCoverageReport --stacktrace

- 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.token=${{ secrets.SONAR_TOKEN }} --stacktrace
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ plugins {
id "java-library"
id "signing"
id "maven-publish"
id "org.sonarqube" version "4.0.0.2929"
}

def graphqlCodegenVersion = '5.10.1-SNAPSHOT' // This variable used in the automatic release process
def graphqlCodegenVersion = '6.0.0-SNAPSHOT' // This variable used in the automatic release process

group = "io.github.kobylynskyi"
version = graphqlCodegenVersion
Expand All @@ -19,9 +18,10 @@ repositories {
}

dependencies {
implementation platform("tools.jackson:jackson-bom:3.0.3")
compileOnly "org.freemarker:freemarker:2.3.32"
compileOnly "com.graphql-java:graphql-java:20.2"
compileOnly "com.fasterxml.jackson.core:jackson-databind:2.15.3"
compileOnly "tools.jackson.core:jackson-databind"
compileOnly "com.typesafe:config:1.4.3"

testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
Expand Down
4 changes: 2 additions & 2 deletions plugins/gradle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ graphqlCodegen {
Price.amount: "java.math.BigDecimal"
]
customAnnotationsMapping = [
DateTime: ["@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.example.json.EpochMillisScalarDeserializer.class)"]
DateTime: ["@tools.jackson.databind.annotation.JsonDeserialize(using = com.example.json.EpochMillisScalarDeserializer.class)"]
]
modelNameSuffix = "TO"
}
Expand All @@ -83,7 +83,7 @@ tasks.named<GraphQLCodegenGradleTask>("graphqlCodegen") {
outputDir = File("$buildDir/generated")
packageName = "com.example.graphql.model"
customTypesMapping = mutableMapOf(Pair("EpochMillis", "java.time.LocalDateTime"))
customAnnotationsMapping = mutableMapOf(Pair("EpochMillis", listOf("@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.example.json.EpochMillisScalarDeserializer.class)")))
customAnnotationsMapping = mutableMapOf(Pair("EpochMillis", listOf("@tools.jackson.databind.annotation.JsonDeserialize(using = com.example.json.EpochMillisScalarDeserializer.class)")))
}

// Automatically generate GraphQL code on project build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {

implementation "org.freemarker:freemarker:2.3.32"
implementation "com.graphql-java:graphql-java:20.2"
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3"
implementation "tools.jackson.core:jackson-databind"
implementation "com.typesafe:config:1.4.3"

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
Expand Down
2 changes: 1 addition & 1 deletion plugins/maven/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</customTypesMapping>
<customAnnotationsMapping>
<EpochMillis>
<annotation>com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.example.json.EpochMillisScalarDeserializer.class)</annotation>
<annotation>tools.jackson.databind.annotation.JsonDeserialize(using = com.example.json.EpochMillisScalarDeserializer.class)</annotation>
</EpochMillis>
</customAnnotationsMapping>
<modelNameSuffix>TO</modelNameSuffix>
Expand Down
4 changes: 2 additions & 2 deletions plugins/maven/graphql-java-codegen-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@
<version>20.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.3</version>
<version>3.0.3</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
Expand Down
80 changes: 0 additions & 80 deletions plugins/sbt/README.md

This file was deleted.

23 changes: 0 additions & 23 deletions plugins/sbt/graphql-java-codegen-sbt-plugin/.scalafmt.conf

This file was deleted.

45 changes: 0 additions & 45 deletions plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt

This file was deleted.

20 changes: 0 additions & 20 deletions plugins/sbt/graphql-java-codegen-sbt-plugin/project/Commands.scala

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading