diff --git a/.github/workflows/nebula.yml b/.github/workflows/nebula.yml index 6bbb379..c50a35d 100644 --- a/.github/workflows/nebula.yml +++ b/.github/workflows/nebula.yml @@ -46,15 +46,6 @@ jobs: - ${{ runner.os }}-gradlewrapper- - name: Gradle build run: ./gradlew --info --stacktrace build - - 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 5cab4fe..38730d8 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { - id 'com.netflix.nebula.plugin-plugin' version '20.0.0' + id 'com.netflix.nebula.plugin-plugin' version '20.2.0' } description 'Plugins to add provided and optional configurations' 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/extraconfigurations/OptionalBasePluginIntegrationTest.groovy b/src/test/groovy/nebula/plugin/extraconfigurations/OptionalBasePluginIntegrationTest.groovy index dcb9bfa..d4da98a 100644 --- a/src/test/groovy/nebula/plugin/extraconfigurations/OptionalBasePluginIntegrationTest.groovy +++ b/src/test/groovy/nebula/plugin/extraconfigurations/OptionalBasePluginIntegrationTest.groovy @@ -49,8 +49,8 @@ dependencies { def output = result.standardOutput.readLines().join('\n').replaceAll("'implementation '", "'implementation'") then: - output.contains("""compileClasspath - Compile classpath for source set 'main'. -\\--- foo:bar:2.4 + output.contains("""compileClasspath - Compile classpath for source set 'main'.""") + output.contains("""\\--- foo:bar:2.4 \\--- custom:baz:5.1.27 """) @@ -82,8 +82,8 @@ dependencies { def output = result.standardOutput.readLines().join('\n').replaceAll("'implementation '", "'implementation'") then: - output.contains("""compileClasspath - Compile classpath for source set 'main'. -\\--- foo:bar:2.4 + output.contains("""compileClasspath - Compile classpath for source set 'main'.""") + output.contains("""\\--- foo:bar:2.4 """) !result.standardOutput.contains('custom:baz:5.1.27')