From 978d5d0527d6b9e2fa8408efa851372749cf2933 Mon Sep 17 00:00:00 2001 From: John Engelman Date: Sat, 19 Jan 2019 20:39:34 -0600 Subject: [PATCH] Update to Gradle 5 and start using properties for conventions when available. --- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 55746 -> 55190 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 -- src/docs/changes/README.md | 9 +++++++-- .../plugins/shadow/ShadowBasePlugin.groovy | 4 ++-- .../plugins/shadow/ShadowJavaPlugin.groovy | 4 ++++ .../plugins/shadow/ShadowPluginSpec.groovy | 8 ++++---- 8 files changed, 21 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index dc14929a9..a90daa7d0 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { } plugins { - id 'com.gradle.build-scan' version '1.16' + id 'com.gradle.build-scan' version '2.1' id 'groovy' id 'project-report' id 'idea' @@ -35,8 +35,8 @@ gradlePlugin { apply plugin: 'com.github.johnrengelman.shadow' buildScan { - licenseAgreementUrl = 'https://gradle.com/terms-of-service' - licenseAgree = 'yes' + termsOfServiceUrl = 'https://gradle.com/terms-of-service' + termsOfServiceAgree = 'yes' if (System.env.CI == 'true') { tag 'CI' if (System.env.CIRCLE_TAG) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 521ea64168ec31a6b305821f81e4dd73022af4a5..87b738cbd051603d91cc39de6cb000dd98fe6b02 100644 GIT binary patch delta 19185 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 S3Uw1<69LmB5I7wu+y4PGXP5K< delta 19608 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 { @Override void apply(Project project) { - if (GradleVersion.current() < GradleVersion.version("4.0")) { - throw new GradleException("This version of Shadow supports Gradle 4.0+ only. Please upgrade.") + if (GradleVersion.current() < GradleVersion.version("5.0")) { + throw new GradleException("This version of Shadow supports Gradle 5.0+ only. Please upgrade.") } project.extensions.create(EXTENSION_NAME, ShadowExtension, project) createShadowConfiguration(project) diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy index 7306224c2..3551a1b3c 100644 --- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy +++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy @@ -11,6 +11,7 @@ import org.gradle.api.plugins.MavenPlugin import org.gradle.api.tasks.Upload import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.configuration.project.ProjectConfigurationActionContainer +import org.gradle.util.GradleVersion import javax.inject.Inject @@ -45,6 +46,9 @@ class ShadowJavaPlugin implements Plugin { 'all' } } + if (GradleVersion.current() >= GradleVersion.version("5.1")) { + shadow.archiveClassifier.set("all") + } shadow.manifest.inheritFrom project.tasks.jar.manifest shadow.doFirst { def files = project.configurations.findByName(ShadowBasePlugin.CONFIGURATION_NAME).files diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy index 4e967cbd9..1ced02a7b 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy @@ -86,13 +86,13 @@ class ShadowPluginSpec extends PluginSpecification { assert output.exists() where: - version << ['4.0', '4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9', '4.10', '5.0-rc-4'] + version << ['5.0', '5.1'] } - def 'Error in Gradle versions < 4.0'() { + def 'Error in Gradle versions < 5.0'() { given: GradleRunner versionRunner = GradleRunner.create() - .withGradleVersion('3.5') + .withGradleVersion('4.5') .withArguments('--stacktrace') .withProjectDir(dir.root) .forwardOutput() @@ -652,7 +652,6 @@ class ShadowPluginSpec extends PluginSpecification { def "include java-library configurations by default"() { given: GradleRunner versionRunner = runner - .withGradleVersion('4.0') .withArguments('--stacktrace') .withDebug(true) @@ -940,6 +939,7 @@ class ShadowPluginSpec extends PluginSpecification { } @Issue("SHADOW-303") + @Ignore("Plugin has been deprecated") def "doesn't error when adding aspectj plugin"() { given: buildFile.text = """