From 0ad60dc3927c0185c4467613798a7f998104e9f4 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Mon, 4 Jan 2021 15:24:17 +0100 Subject: [PATCH 1/5] Fix failing build issue in PR on JDK15 --- build.gradle | 4 ++++ .../graphiql/boot/GraphiQLProperties.java | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 68e22a84..d115776d 100644 --- a/build.gradle +++ b/build.gradle @@ -37,6 +37,10 @@ sonarqube { } } +jacoco { + toolVersion = "0.8.7.202012290703" +} + subprojects { apply plugin: 'idea' apply plugin: 'jacoco' diff --git a/graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLProperties.java b/graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLProperties.java index 58f16e68..85b69d7a 100644 --- a/graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLProperties.java +++ b/graphiql-spring-boot-autoconfigure/src/main/java/graphql/kickstart/graphiql/boot/GraphiQLProperties.java @@ -32,12 +32,27 @@ static class CodeMirror { @Data static class Props { - private Variables variables = new Variables(); + private GraphiQLVariables variables = new GraphiQLVariables(); + /** + * See https://github.com/graphql/graphiql/tree/main/packages/graphiql#props + */ @Data - static class Variables { + static class GraphiQLVariables { + private String query; + private String variables; + private String headers; + private String operationName; + private String response; + private String defaultQuery; + private boolean defaultVariableEditorOpen; + private boolean defaultSecondaryEditorOpen; private String editorTheme; + private boolean readOnly; + private boolean docsExplorerOpen; + private boolean headerEditorEnabled; + private boolean shouldPersistHeaders; } } From 980473db2cdc904c38aee0f6bc258a94b4636478 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Mon, 4 Jan 2021 15:31:27 +0100 Subject: [PATCH 2/5] Fix failing build issue in PR on JDK15 --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d115776d..de10701d 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,6 @@ sonarqube { } } -jacoco { - toolVersion = "0.8.7.202012290703" -} - subprojects { apply plugin: 'idea' apply plugin: 'jacoco' @@ -92,6 +88,10 @@ subprojects { } } + jacoco { + toolVersion = "0.8.7.202012290703" + } + jacocoTestReport { reports { xml.enabled = true From 621c71e8b1f9214e11a6e1c8f571f981877ad92d Mon Sep 17 00:00:00 2001 From: oliemansm Date: Mon, 4 Jan 2021 15:39:49 +0100 Subject: [PATCH 3/5] Snapshot repository for jacoco --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index de10701d..eaca3afd 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,7 @@ subprojects { maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" } maven { url "https://repo.spring.io/libs-milestone" } maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" } + maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } dependencyManagement { From 698ed3953ed32fa1023ee9b054f1c79b5054ef90 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Mon, 4 Jan 2021 15:42:57 +0100 Subject: [PATCH 4/5] Snapshot repository for jacoco --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index eaca3afd..48d5d3f0 100644 --- a/build.gradle +++ b/build.gradle @@ -56,8 +56,8 @@ subprojects { jcenter() maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" } maven { url "https://repo.spring.io/libs-milestone" } - maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" } + maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" } } dependencyManagement { From 68359c2f1222f8255123bd7e5196f4af9bdebd08 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Mon, 4 Jan 2021 15:46:25 +0100 Subject: [PATCH 5/5] Snapshot repository for jacoco --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 48d5d3f0..128bd07a 100644 --- a/build.gradle +++ b/build.gradle @@ -90,7 +90,7 @@ subprojects { } jacoco { - toolVersion = "0.8.7.202012290703" + toolVersion = "0.8.7-SNAPSHOT" } jacocoTestReport {