From a1c995898f5d01571410f8e9b77d7b3c29a7cf71 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Thu, 29 Apr 2021 10:38:01 +0200 Subject: [PATCH 1/2] chore(deps): update dependency gradle to v7.0 --- build.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b935997f..bbd7a37d 100644 --- a/build.gradle +++ b/build.gradle @@ -184,5 +184,5 @@ nexusStaging { } wrapper { - gradleVersion = "${GRADLE_WRAPPER_VER}" + distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.properties b/gradle.properties index acc5d664..06244d09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,4 +12,4 @@ LIB_JACKSON_VER=2.12.0 LIB_SLF4J_VER=1.7.30 SOURCE_COMPATIBILITY=1.8 TARGET_COMPATIBILITY=1.8 -GRADLE_WRAPPER_VER=6.7.1 +GRADLE_WRAPPER_VER=7.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1f3fdbc5..3c4101c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From f7b9e30155c4a2ff92196af44adcacd23cc5b5e0 Mon Sep 17 00:00:00 2001 From: oliemansm Date: Thu, 29 Apr 2021 18:49:27 +0200 Subject: [PATCH 2/2] chore(deps): fix gradle 7 configuration --- graphql-java-kickstart/build.gradle | 12 +++++++----- graphql-java-servlet/build.gradle | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/graphql-java-kickstart/build.gradle b/graphql-java-kickstart/build.gradle index 91980b72..068d379b 100644 --- a/graphql-java-kickstart/build.gradle +++ b/graphql-java-kickstart/build.gradle @@ -4,14 +4,16 @@ jar { bndfile = 'bnd.bnd' } +apply plugin: 'java-library-distribution' + dependencies { // GraphQL - compile "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER" + api "com.graphql-java:graphql-java:$LIB_GRAPHQL_JAVA_VER" implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER" // JSON - compile "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER" - compile "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER" - compile "com.fasterxml.jackson.core:jackson-databind:$LIB_JACKSON_VER" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER" + api "com.fasterxml.jackson.core:jackson-core:$LIB_JACKSON_VER" + api "com.fasterxml.jackson.core:jackson-annotations:$LIB_JACKSON_VER" + api "com.fasterxml.jackson.core:jackson-databind:$LIB_JACKSON_VER" + api "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$LIB_JACKSON_VER" } diff --git a/graphql-java-servlet/build.gradle b/graphql-java-servlet/build.gradle index 4eb22872..c9a976f1 100644 --- a/graphql-java-servlet/build.gradle +++ b/graphql-java-servlet/build.gradle @@ -17,8 +17,8 @@ dependencies { api(project(':graphql-java-kickstart')) // Servlet - compile 'javax.servlet:javax.servlet-api:3.1.0' - compile 'javax.websocket:javax.websocket-api:1.1' + api 'javax.servlet:javax.servlet-api:3.1.0' + api 'javax.websocket:javax.websocket-api:1.1' implementation "org.slf4j:slf4j-api:$LIB_SLF4J_VER" // OSGi @@ -29,15 +29,15 @@ dependencies { compileOnly 'org.osgi:org.osgi.service.metatype.annotations:1.3.0' compileOnly 'org.osgi:org.osgi.annotation:6.0.0' - testCompile 'io.github.graphql-java:graphql-java-annotations:8.3' + testImplementation 'io.github.graphql-java:graphql-java-annotations:8.3' // Unit testing - testCompile "org.codehaus.groovy:groovy-all:2.4.1" - testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-3" - testRuntime "cglib:cglib-nodep:3.2.4" - testRuntime "org.objenesis:objenesis:2.5.1" - testCompile "org.slf4j:slf4j-simple:$LIB_SLF4J_VER" - testCompile 'org.springframework:spring-test:4.3.7.RELEASE' - testRuntime 'org.springframework:spring-web:4.3.7.RELEASE' - testCompile 'com.google.guava:guava:24.1.1-jre' + testImplementation "org.codehaus.groovy:groovy-all:2.4.1" + testImplementation "org.spockframework:spock-core:1.1-groovy-2.4-rc-3" + testRuntimeOnly "cglib:cglib-nodep:3.2.4" + testRuntimeOnly "org.objenesis:objenesis:2.5.1" + testImplementation "org.slf4j:slf4j-simple:$LIB_SLF4J_VER" + testImplementation 'org.springframework:spring-test:4.3.7.RELEASE' + testRuntimeOnly 'org.springframework:spring-web:4.3.7.RELEASE' + testImplementation 'com.google.guava:guava:24.1.1-jre' }