This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 16c8ae886aac26f08c77130cf0697095236be230 Author: Bo Zhang <[email protected]> AuthorDate: Thu Jan 16 10:34:35 2020 +0800 GROOVY-9371: Update gradle wrapper to 6.1 plus fix associated issues (closes #1142) --- build.gradle | 9 ++------- gradle/assemble.gradle | 2 -- gradle/build-scans.gradle | 16 +++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 11 +++++++++++ 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index b78b581..70d4f62 100644 --- a/build.gradle +++ b/build.gradle @@ -45,16 +45,11 @@ buildscript { } plugins { - id 'com.gradle.build-scan' version '2.4.2' id 'me.champeau.buildscan-recipes' version '0.2.3' // upgrade spotbugs upon fix of: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/166 - id 'com.github.spotbugs' version '1.6.9' + id 'com.github.spotbugs' version '3.0.0' id "com.github.ben-manes.versions" version '0.27.0' -} - -buildScan { - termsOfServiceUrl = 'https://gradle.com/terms-of-service' - apply from: 'gradle/build-scans.gradle' + id "com.github.blindpirate.osgi" version "0.0.1" } buildScanRecipes { diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 3a3219e..92f1d23 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -20,8 +20,6 @@ import org.apache.tools.ant.filters.ReplaceTokens import org.codehaus.groovy.gradle.JarJarTask -apply plugin: 'osgi' - group = 'org.codehaus.groovy' archivesBaseName = 'groovy' diff --git a/gradle/build-scans.gradle b/gradle/build-scans.gradle index 8602f9d..9d0b4ef 100644 --- a/gradle/build-scans.gradle +++ b/gradle/build-scans.gradle @@ -23,13 +23,14 @@ boolean isCI = env.CI || env.TRAVIS || env.TEAMCITY_VERSION boolean hasAccepted = isCI || env.GRADLE_SCANS_ACCEPT=='yes' || acceptFile.exists() && acceptFile.text.trim() == 'yes' boolean hasRefused = env.GRADLE_SCANS_ACCEPT=='no' || acceptFile.exists() && acceptFile.text.trim() == 'no' -buildScan { - if (hasAccepted) { - termsOfServiceAgree = 'yes' - publishAlways() - } else if (!hasRefused) { - gradle.buildFinished { - println """ +gradleEnterprise { + buildScan { + if (hasAccepted) { + termsOfServiceAgree = 'yes' + publishAlways() + } else if (!hasRefused) { + gradle.buildFinished { + println """ This build uses Gradle Build Scans to gather statistics, share information about failures, environmental issues, dependencies resolved during the build and more. Build scans will be published after each build, if you accept the terms of @@ -48,6 +49,7 @@ and then: And we'll not bother you again. Note that build scans are only made public if you share the URL at the end of the build. """ + } } } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5028f28..ba94df8 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-5.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index d7875d2..5e23353 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,6 +18,17 @@ */ import org.gradle.util.GradleVersion +plugins { + id "com.gradle.enterprise" version "3.1.1" +} + +gradleEnterprise { + buildScan { + termsOfServiceUrl = 'https://gradle.com/terms-of-service' + apply from: 'gradle/build-scans.gradle' + } +} + def subprojects = ['groovy-ant', 'groovy-bsf', 'groovy-cli-commons',
