Skip to content

G
Graphql Java Codegen

梦境迷离 / Graphql Java Codegen
10 个月 前同步成功

通知 2
Star 0
Fork 0
G
Graphql Java Codegen

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 81514737 编写于 作者: B Bogdan Kobylynskyi 提交者： GitHub
浏览文件
操作

Update all dependencies and test on Java 11 and 17 #1063 (#1114)

上级 d154ef92
隐藏空白更改
内联 并排
Showing with 68 addition and 72 deletion
.github/workflows/github.yml
浏览文件 @ 81514737
......@@ -5,6 +5,7 @@ on:
branches:
- master
- develop
- java-11-17
pull_request:
branches:
- master
......@@ -15,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jdk-version: [ 1.8 ]
jdk-version: [ 8, 11, 17 ]
steps:
- uses: actions/checkout@v2
......
build.gradle
浏览文件 @ 81514737
......@@ -6,7 +6,7 @@ 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.2-SNAPSHOT' // This variable used in the automatic release process
......@@ -16,18 +16,17 @@ 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 {
......
gradle/wrapper/gradle-wrapper.properties
浏览文件 @ 81514737
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
plugins/gradle/example-client-kotlin/build.gradle
浏览文件 @ 81514737
......@@ -12,8 +12,6 @@ def graphqlCodegenClientKotlinVersion = '5.7.2-SNAPSHOT' // Variable used in the
group = 'io.github.dreamylost'
version = graphqlCodegenClientKotlinVersion
sourceCompatibility = 1.8
sourceSets {
main.kotlin.srcDirs += "$buildDir/generated-server"
}
......@@ -24,21 +22,24 @@ repositories {
}
mavenCentral()
mavenLocal()
jcenter()
}
dependencies {
// use the latest available version:
// https://search.maven.org/artifact/io.github.kobylynskyi/graphql-java-codegen
implementation "io.github.kobylynskyi:graphql-java-codegen:5.7.2-SNAPSHOT"
implementation "javax.validation:validation-api:2.0.1.Final"
implementation "com.squareup.okhttp3:okhttp:4.2.2"
implementation "com.fasterxml.jackson.core:jackson-core:2.13.3"
implementation "com.fasterxml.jackson.core:jackson-databind:2.13.3"
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.3"
implementation "com.fasterxml.jackson.core:jackson-annotations:2.13.3"
implementation "com.fasterxml.jackson.core:jackson-core:2.14.2"
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.2"
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2"
implementation "com.fasterxml.jackson.core:jackson-annotations:2.14.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
}
/**
......@@ -66,4 +67,4 @@ task graphqlCodegenKotlinService(type: GraphQLCodegenGradleTask) {
]
modelNameSuffix = "TO"
supportUnknownFields = true
}
\ No newline at end of file
}
plugins/gradle/example-client/build.gradle
浏览文件 @ 81514737
......@@ -27,15 +27,15 @@ dependencies {
implementation "org.apache.httpcomponents:httpclient:4.5.13"
implementation "javax.validation:validation-api:2.0.1.Final"
implementation "org.mapstruct:mapstruct:1.4.2.Final"
annotationProcessor "org.mapstruct:mapstruct-processor:1.4.2.Final"
implementation "org.mapstruct:mapstruct:1.5.3.Final"
annotationProcessor "org.mapstruct:mapstruct-processor:1.5.3.Final"
compileOnly "org.projectlombok:lombok:1.18.18"
annotationProcessor "org.projectlombok:lombok:1.18.12"
compileOnly "org.projectlombok:lombok:1.18.26"
annotationProcessor "org.projectlombok:lombok:1.18.26"
testImplementation "io.rest-assured:rest-assured:4.3.3"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.2"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.2"
}
......
plugins/gradle/example-server/build.gradle
浏览文件 @ 81514737
......@@ -21,11 +21,13 @@ dependencies {
implementation "javax.validation:validation-api:2.0.1.Final"
implementation "org.mapstruct:mapstruct:1.4.2.Final"
annotationProcessor "org.mapstruct:mapstruct-processor:1.4.2.Final"
compileOnly "org.projectlombok:lombok:1.18.26"
annotationProcessor "org.projectlombok:lombok:1.18.26"
compileOnly "org.projectlombok:lombok:1.18.18"
annotationProcessor "org.projectlombok:lombok:1.18.12"
implementation 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
implementation "org.mapstruct:mapstruct:1.5.3.Final"
annotationProcessor "org.mapstruct:mapstruct-processor:1.5.3.Final"
}
compileJava.dependsOn "graphqlCodegen"
......
plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle
浏览文件 @ 81514737
plugins {
id "com.gradle.plugin-publish" version "0.14.0"
id "com.gradle.plugin-publish" version "1.1.0"
id "java-gradle-plugin"
}
......@@ -9,7 +9,6 @@ repositories {
}
mavenCentral()
mavenLocal()
jcenter()
}
apply plugin: "java"
......@@ -28,28 +27,24 @@ dependencies {
implementation "io.github.kobylynskyi:graphql-java-codegen:${version}"
implementation "org.freemarker:freemarker:2.3.31"
implementation "com.graphql-java:graphql-java:16.2"
implementation "com.fasterxml.jackson.core:jackson-databind:2.13.3"
implementation "com.graphql-java:graphql-java:20.1"
implementation "com.fasterxml.jackson.core:jackson-databind:2.14.2"
implementation "com.typesafe:config:1.4.1"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
}
gradlePlugin {
website = 'https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle/graphql-java-codegen-gradle-plugin'
vcsUrl = 'https://github.com/kobylynskyi/graphql-java-codegen'
plugins {
graphqlCodegen {
id = 'io.github.kobylynskyi.graphql.codegen'
displayName = 'GraphQL Java Codegen'
description = project.description
description = 'Gradle plugin for GraphQL Java code generation'
implementationClass = 'io.github.kobylynskyi.graphql.codegen.gradle.GraphQLCodegenGradlePlugin'
tags.set(['graphql', 'graphql-java', 'graphql-java-codegen', 'graphql-codegen'])
}
}
}
pluginBundle {
website = 'https://github.com/kobylynskyi/graphql-java-codegen/tree/master/plugins/gradle/graphql-java-codegen-gradle-plugin'
vcsUrl = 'https://github.com/kobylynskyi/graphql-java-codegen'
description = 'Gradle plugin for GraphQL Java code generation'
tags = ['graphql', 'graphql-java', 'graphql-java-codegen', 'graphql-codegen']
}
\ No newline at end of file
plugins/gradle/graphql-java-codegen-gradle-plugin/src/main/resources/META-INF/gradle-plugins/io.github.kobylynskyi.graphql.codegen.properties 已删除 100644 → 0
浏览文件 @ d154ef92
implementation-class=io.github.kobylynskyi.graphql.codegen.gradle.GraphQLCodegenGradlePlugin
\ No newline at end of file
plugins/maven/example-client/pom.xml
浏览文件 @ 81514737
......@@ -106,12 +106,12 @@
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<version>1.18.26</version>
</annotationProcessorPath>
<annotationProcessorPath>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.4.1.Final</version>
<version>1.5.3.Final</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
......@@ -169,12 +169,12 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>1.4.2.Final</version>
<version>1.5.3.Final</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.18</version>
<version>1.18.26</version>
</dependency>
<dependency>
......@@ -185,12 +185,12 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.7.1</version>
<version>5.9.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.7.1</version>
<version>5.9.2</version>
</dependency>
</dependencies>
......
plugins/maven/example-server/pom.xml
浏览文件 @ 81514737
......@@ -59,12 +59,12 @@
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<version>1.18.26</version>
</annotationProcessorPath>
<annotationProcessorPath>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.4.1.Final</version>
<version>1.5.3.Final</version>
</annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
......@@ -109,12 +109,12 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>1.4.2.Final</version>
<version>1.5.3.Final</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.18</version>
<version>1.18.26</version>
</dependency>
</dependencies>
......
plugins/maven/graphql-java-codegen-maven-plugin/pom.xml
浏览文件 @ 81514737
......@@ -58,17 +58,17 @@
<properties>
<version.maven-plugin-api>3.8.1</version.maven-plugin-api>
<version.maven-core>3.8.1</version.maven-core>
<version.maven-plugin-annotations>3.6.1</version.maven-plugin-annotations>
<version.maven-plugin-plugin>3.6.1</version.maven-plugin-plugin>
<version.maven-plugin-annotations>3.8.1</version.maven-plugin-annotations>
<version.maven-plugin-plugin>3.8.1</version.maven-plugin-plugin>
<version.maven-compiler-plugin>3.8.1</version.maven-compiler-plugin>
<version.maven-resources-plugin>3.2.0</version.maven-resources-plugin>
<version.maven-resources-plugin>3.3.0</version.maven-resources-plugin>
<version.maven-source-plugin>3.2.1</version.maven-source-plugin>
<version.maven-javadoc-plugin>3.2.0</version.maven-javadoc-plugin>
<version.maven-deploy-plugin>3.0.0-M1</version.maven-deploy-plugin>
<version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
<version.maven-release-plugin>2.5.3</version.maven-release-plugin>
<version.maven-build-helper-plugin>3.2.0</version.maven-build-helper-plugin>
<version.maven-scm-provider-gitexe>1.11.2</version.maven-scm-provider-gitexe>
<version.maven-javadoc-plugin>3.5.0</version.maven-javadoc-plugin>
<version.maven-deploy-plugin>3.1.0</version.maven-deploy-plugin>
<version.nexus-staging-maven-plugin>1.6.13</version.nexus-staging-maven-plugin>
<version.maven-release-plugin>3.0.0</version.maven-release-plugin>
<version.maven-build-helper-plugin>3.3.0</version.maven-build-helper-plugin>
<version.maven-scm-provider-gitexe>2.0.0</version.maven-scm-provider-gitexe>
<version.maven-gpg-plugin>3.0.1</version.maven-gpg-plugin>
<version.maven-shared-utils>3.3.4</version.maven-shared-utils>
......@@ -118,17 +118,17 @@
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java</artifactId>
<version>16.2</version>
<version>20.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.3</version>
<version>2.14.2</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>1.4.1</version>
<version>1.4.2</version>
</dependency>
</dependencies>
......
plugins/sbt/graphql-java-codegen-sbt-plugin/build.sbt
浏览文件 @ 81514737
......@@ -34,7 +34,7 @@ lazy val `graphql-codegen-sbt-plugin` = Project(id = "graphql-codegen-sbt-plugin
libraryDependencies ++= Seq(
"io.github.kobylynskyi" % "graphql-java-codegen" % (ThisBuild / version).value,
"org.freemarker" % "freemarker" % "2.3.31",
"com.graphql-java" % "graphql-java" % "16.2",
"com.graphql-java" % "graphql-java" % "20.1",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.12.1",
"com.typesafe" % "config" % "1.4.2"
),
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或