From c14cbeb060ee23f56fba62fa189c427dd32ee652 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Mon, 13 Sep 2021 12:09:46 -0700 Subject: [PATCH] Gradle 7 support --- build.gradle | 2 +- gradle.lockfile | 23 +++++++++++++++++++ .../annotationProcessor.lockfile | 3 --- .../compileClasspath.lockfile | 9 -------- .../integTestAnnotationProcessor.lockfile | 3 --- .../integTestCompileClasspath.lockfile | 13 ----------- .../integTestRuntimeClasspath.lockfile | 15 ------------ .../runtimeClasspath.lockfile | 9 -------- .../testAnnotationProcessor.lockfile | 3 --- .../testCompileClasspath.lockfile | 13 ----------- .../testRuntimeClasspath.lockfile | 15 ------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 25 insertions(+), 85 deletions(-) create mode 100644 gradle.lockfile delete mode 100644 gradle/dependency-locks/annotationProcessor.lockfile delete mode 100644 gradle/dependency-locks/compileClasspath.lockfile delete mode 100644 gradle/dependency-locks/integTestAnnotationProcessor.lockfile delete mode 100644 gradle/dependency-locks/integTestCompileClasspath.lockfile delete mode 100644 gradle/dependency-locks/integTestRuntimeClasspath.lockfile delete mode 100644 gradle/dependency-locks/runtimeClasspath.lockfile delete mode 100644 gradle/dependency-locks/testAnnotationProcessor.lockfile delete mode 100644 gradle/dependency-locks/testCompileClasspath.lockfile delete mode 100644 gradle/dependency-locks/testRuntimeClasspath.lockfile diff --git a/build.gradle b/build.gradle index 0273c07..fb1bfa6 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { - id 'nebula.plugin-plugin' version '15.4.1' + id 'nebula.plugin-plugin' version '16.0.1' } description 'Plugins to add provided and optional configurations' diff --git a/gradle.lockfile b/gradle.lockfile new file mode 100644 index 0000000..6b09d24 --- /dev/null +++ b/gradle.lockfile @@ -0,0 +1,23 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-gradle-interop:1.0.11=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.netflix.nebula:nebula-test:10.0.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.6=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.3.50=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.7.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.7.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.0-M4-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-junit4:2.0-M4-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +empty=annotationProcessor,integTestAnnotationProcessor,testAnnotationProcessor diff --git a/gradle/dependency-locks/annotationProcessor.lockfile b/gradle/dependency-locks/annotationProcessor.lockfile deleted file mode 100644 index 656c5db..0000000 --- a/gradle/dependency-locks/annotationProcessor.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/compileClasspath.lockfile b/gradle/dependency-locks/compileClasspath.lockfile deleted file mode 100644 index d75ab7e..0000000 --- a/gradle/dependency-locks/compileClasspath.lockfile +++ /dev/null @@ -1,9 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.netflix.nebula:nebula-gradle-interop:1.0.11 -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains:annotations:13.0 diff --git a/gradle/dependency-locks/integTestAnnotationProcessor.lockfile b/gradle/dependency-locks/integTestAnnotationProcessor.lockfile deleted file mode 100644 index 656c5db..0000000 --- a/gradle/dependency-locks/integTestAnnotationProcessor.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/integTestCompileClasspath.lockfile b/gradle/dependency-locks/integTestCompileClasspath.lockfile deleted file mode 100644 index 8af4910..0000000 --- a/gradle/dependency-locks/integTestCompileClasspath.lockfile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.netflix.nebula:nebula-gradle-interop:1.0.11 -com.netflix.nebula:nebula-test:9.0.0 -junit:junit:4.12 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains:annotations:13.0 -org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/dependency-locks/integTestRuntimeClasspath.lockfile b/gradle/dependency-locks/integTestRuntimeClasspath.lockfile deleted file mode 100644 index 856bed2..0000000 --- a/gradle/dependency-locks/integTestRuntimeClasspath.lockfile +++ /dev/null @@ -1,15 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -cglib:cglib-nodep:3.2.2 -com.netflix.nebula:nebula-gradle-interop:1.0.11 -com.netflix.nebula:nebula-test:9.0.0 -junit:junit:4.12 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains:annotations:13.0 -org.objenesis:objenesis:2.4 -org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/dependency-locks/runtimeClasspath.lockfile b/gradle/dependency-locks/runtimeClasspath.lockfile deleted file mode 100644 index d75ab7e..0000000 --- a/gradle/dependency-locks/runtimeClasspath.lockfile +++ /dev/null @@ -1,9 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.netflix.nebula:nebula-gradle-interop:1.0.11 -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains:annotations:13.0 diff --git a/gradle/dependency-locks/testAnnotationProcessor.lockfile b/gradle/dependency-locks/testAnnotationProcessor.lockfile deleted file mode 100644 index 656c5db..0000000 --- a/gradle/dependency-locks/testAnnotationProcessor.lockfile +++ /dev/null @@ -1,3 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. diff --git a/gradle/dependency-locks/testCompileClasspath.lockfile b/gradle/dependency-locks/testCompileClasspath.lockfile deleted file mode 100644 index 8af4910..0000000 --- a/gradle/dependency-locks/testCompileClasspath.lockfile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.netflix.nebula:nebula-gradle-interop:1.0.11 -com.netflix.nebula:nebula-test:9.0.0 -junit:junit:4.12 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains:annotations:13.0 -org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/dependency-locks/testRuntimeClasspath.lockfile b/gradle/dependency-locks/testRuntimeClasspath.lockfile deleted file mode 100644 index 856bed2..0000000 --- a/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ /dev/null @@ -1,15 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -cglib:cglib-nodep:3.2.2 -com.netflix.nebula:nebula-gradle-interop:1.0.11 -com.netflix.nebula:nebula-test:9.0.0 -junit:junit:4.12 -org.hamcrest:hamcrest-core:1.3 -org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50 -org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -org.jetbrains:annotations:13.0 -org.objenesis:objenesis:2.4 -org.spockframework:spock-core:1.3-groovy-2.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 549d844..ffed3a2 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists