Skip to content

Commit

Permalink
Merge pull request #753 from Netflix/kavitha/update-jdk-graphql-java
Browse files Browse the repository at this point in the history 
Update to jdk17 and DGS to latest 9.x.
  • Loading branch information
@iuliiasobolevska
iuliiasobolevska authored Nov 18, 2024
2 parents 8e8b181 + cdaa61e commit 28c47f5
Show file tree
Hide file tree
Showing 15 changed files with 693 additions and 1,021 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 8
java-version: 17

- name: Set up Python 3.8
uses: actions/[email protected]
Expand Down Expand Up @@ -56,14 +56,14 @@ jobs:
- name: Clone dgs-examples-java
uses: actions/checkout@v4
with:
repository: Netflix/dgs-examples-java-2.7
path: build/examples/dgs-examples-java-2.7
repository: Netflix/dgs-examples-java
path: build/examples/dgs-examples-java

- name: Clone dgs-examples-kotlin
uses: actions/checkout@v4
with:
repository: Netflix/dgs-examples-kotlin-2.7
path: build/examples/dgs-examples-kotlin-2.7
repository: Netflix/dgs-examples-kotlin
path: build/examples/dgs-examples-kotlin

- name: Build Examples
run: |
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ allprojects {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(17))
}
}
}
Expand Down
34 changes: 17 additions & 17 deletions dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,35 +407,35 @@
]
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit.jupiter:junit-jupiter-params",
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-params": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-commons": {
"locked": "1.10.3",
"locked": "1.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit:junit-bom"
]
},
"org.junit:junit-bom": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit.jupiter:junit-jupiter-api",
Expand Down Expand Up @@ -542,35 +542,35 @@
]
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit.jupiter:junit-jupiter-params",
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-params": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-commons": {
"locked": "1.10.3",
"locked": "1.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit:junit-bom"
]
},
"org.junit:junit-bom": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit.jupiter:junit-jupiter-api",
Expand Down Expand Up @@ -677,13 +677,13 @@
]
},
"org.junit.jupiter:junit-jupiter": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit.jupiter:junit-jupiter-engine",
Expand All @@ -692,36 +692,36 @@
]
},
"org.junit.jupiter:junit-jupiter-engine": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-params": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-commons": {
"locked": "1.10.3",
"locked": "1.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.platform:junit-platform-engine",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-engine": {
"locked": "1.10.3",
"locked": "1.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit:junit-bom"
]
},
"org.junit:junit-bom": {
"locked": "5.10.3",
"locked": "5.10.5",
"transitive": [
"org.junit.jupiter:junit-jupiter",
"org.junit.jupiter:junit-jupiter-api",
Expand Down
10 changes: 5 additions & 5 deletions graphql-dgs-codegen-core/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ plugins {


dependencies {
implementation platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:5.5.1")
implementation platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:9.1.3")

implementation(project(":graphql-dgs-codegen-shared-core"))

implementation('com.netflix.graphql.dgs:graphql-dgs') { transitive = false }
implementation 'com.graphql-java:graphql-java'
implementation 'com.fasterxml.jackson.core:jackson-annotations'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.+'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.18.+'
implementation 'org.slf4j:slf4j-api'

implementation 'com.squareup:javapoet:1.13.+'
implementation 'com.squareup:kotlinpoet:1.17.+'
implementation 'com.github.ajalt.clikt:clikt:4.4.+'

implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.+'
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.+'
implementation 'jakarta.annotation:jakarta.annotation-api:3.0.+'


testImplementation 'com.google.testing.compile:compile-testing:0.+'
Expand Down
Loading

0 comments on commit 28c47f5

Please sign in to comment.