From fd9e3e1f688a9c46af80a23265389f2bcb81b41b Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Tue, 3 Jan 2023 16:17:43 -0800 Subject: [PATCH] Gradle 8.0-rc-1 --- .github/workflows/nebula.yml | 9 --------- build.gradle | 8 +++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../AbstractDependencyLockPluginSpec.groovy | 7 ------- .../DependencyLockPluginWithCoreSpec.groovy | 11 ++++------- ...CachingAndDependencyLockingFeatureFlagsSpec.groovy | 5 ----- 6 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml index 4d33f6c..4643a57 100644 --- a/.github/workflows/nebula.yml +++ b/.github/workflows/nebula.yml @@ -51,15 +51,6 @@ jobs: - ${{ runner.os }}-gradlewrapper- - name: Gradle build run: ./gradlew --stacktrace build --scan - - name: Post-success actions - if: success() - run: ./gradlew jacocoTestReport coveralls - env: - CI_NAME: github_actions - CI_BUILD_NUMBER: ${{ github.sha }} - CI_BUILD_URL: 'https://github.com/${{ github.repository }}' - CI_BRANCH: ${{ github.ref }} - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish: if: startsWith(github.ref, 'refs/tags/v') needs: validation diff --git a/build.gradle b/build.gradle index d30839d..fcbded3 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,11 @@ import org.gradle.util.GradleVersion plugins { - id 'com.netflix.nebula.plugin-plugin' version '20.0.0' - id 'com.netflix.nebula.optional-base' version '8.0.0' + id 'com.netflix.nebula.plugin-plugin' version '20.2.0' + id 'com.netflix.nebula.optional-base' version '9.0.0' id "org.jetbrains.kotlin.jvm" version "1.7.20" id 'java-gradle-plugin' - id "org.gradle.test-retry" version "1.4.1" + id "org.gradle.test-retry" version "1.5.0" } description 'Gradle plugin to allow locking of dynamic dependency versions' @@ -97,6 +97,8 @@ if (GradleVersion.version(project.gradle.gradleVersion) >= (GradleVersion.versio classes.dependsOn compileKotlin } +test.dependsOn jar + tasks.withType(Test) { testLogging { events "PASSED", "FAILED", "SKIPPED" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..d603f1a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy index 1bcf548..23ce10a 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/AbstractDependencyLockPluginSpec.groovy @@ -21,11 +21,6 @@ class AbstractDependencyLockPluginSpec extends IntegrationTestKitSpec { def mavenrepo def projectName - //to avoid enableFeaturePreview('ONE_LOCKFILE_PER_PROJECT') has been deprecated - @Rule - public final ProvideSystemProperty provideSystemProperty = new ProvideSystemProperty("ignoreDeprecations", "true") - - def setup() { keepFiles = true new File("${projectDir}/gradle.properties").text = "systemProp.nebula.features.coreLockingSupport=true" @@ -33,8 +28,6 @@ class AbstractDependencyLockPluginSpec extends IntegrationTestKitSpec { projectName = getProjectDir().getName().replaceAll(/_\d+/, '') settingsFile << """\ rootProject.name = '${projectName}' - - enableFeaturePreview('ONE_LOCKFILE_PER_PROJECT') """.stripIndent() def graph = new DependencyGraphBuilder() diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy index 51544c5..3aca04a 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy @@ -94,7 +94,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec plugins { id 'com.netflix.nebula.dependency-lock' id 'java' - id 'com.github.johnrengelman.shadow' version '5.0.0' + id 'com.github.johnrengelman.shadow' version '7.1.0' } repositories { ${mavenrepo.mavenRepositoryBlock} @@ -166,7 +166,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec plugins { id 'com.netflix.nebula.dependency-lock' id 'java' - id 'com.github.johnrengelman.shadow' version '5.0.0' + id 'com.github.johnrengelman.shadow' version '7.1.0' } repositories { ${mavenrepo.mavenRepositoryBlock} @@ -371,7 +371,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec buildFile << """\ plugins { id 'com.netflix.nebula.dependency-lock' - id 'nebula.kotlin' version '1.3.41' + id "org.jetbrains.kotlin.jvm" version "1.8.0" } repositories { ${mavenrepo.mavenRepositoryBlock} @@ -436,7 +436,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec addSubproject("sub1", """ plugins { id 'com.netflix.nebula.dependency-lock' - id 'nebula.kotlin' version '1.3.41' + id "org.jetbrains.kotlin.jvm" version "1.8.0" } dependencies { $configuration 'test.nebula:a:1.+' @@ -560,7 +560,6 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec repositories { maven { url "https://plugins.gradle.org/m2/" } } dependencies { classpath "com.netflix.nebula:nebula-clojure-plugin:9.4.3" - classpath "com.netflix.nebula:nebula-kotlin-plugin:1.3.40" } } $plugins @@ -608,14 +607,12 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec 'java' | true | 'applied first' 'java-library' | true | 'applied first' 'nebula.clojure' | true | 'applied first' - 'nebula.kotlin' | true | 'applied first' 'scala' | true | 'applied first' 'groovy' | false | 'applied last' 'java' | false | 'applied last' 'java-library' | false | 'applied last' 'nebula.clojure' | false | 'applied last' - 'nebula.kotlin' | false | 'applied last' 'scala' | false | 'applied last' } diff --git a/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy index 14f40c9..34f567d 100644 --- a/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy +++ b/src/test/groovy/nebula/plugin/dependencylock/caching/AbstractCachingAndDependencyLockingFeatureFlagsSpec.groovy @@ -41,9 +41,6 @@ class AbstractCachingAndDependencyLockingFeatureFlagsSpec extends IntegrationTes File repo String uniqueId - //to avoid enableFeaturePreview('ONE_LOCKFILE_PER_PROJECT') has been deprecated - @Rule - public final ProvideSystemProperty provideSystemProperty = new ProvideSystemProperty("ignoreDeprecations", "true") def setupSpec() { if (wireMockServer != null && wireMockServer.isRunning()) { @@ -69,8 +66,6 @@ class AbstractCachingAndDependencyLockingFeatureFlagsSpec extends IntegrationTes projectName = getProjectDir().getName().replaceAll(/_\d+/, '') settingsFile << """\ rootProject.name = '${projectName}' - - enableFeaturePreview('ONE_LOCKFILE_PER_PROJECT') """.stripIndent() serverUrl = wireMockServer.url('/').toString()