Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle 6.x support #517

Merged
merged 2 commits into from
Nov 10, 2019
Merged

Gradle 6.x support #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa6c161
Use newer gradle configurations and set DuplicatesStrategy for Shadow…
rpalcolea Sep 24, 2019
7495ce9
Use INCLUDE duplicate strategy as default
rpalcolea Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.9.9"
classpath "com.gradle.publish:plugin-publish-plugin:0.10.0"
classpath 'org.ajoberstar:grgit:2.1.1'
classpath 'org.ajoberstar:gradle-git-publish:0.3.3'
Expand Down
24 changes: 12 additions & 12 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ dependencies {
shadow gradleApi()
shadow 'org.codehaus.groovy:groovy-backports-compat23:2.4.15'

compile 'org.jdom:jdom2:2.0.6'
compile 'org.ow2.asm:asm:7.0-beta'
compile 'org.ow2.asm:asm-commons:7.0-beta'
compile 'commons-io:commons-io:2.5'
compile 'org.apache.ant:ant:1.9.7'
compile 'org.codehaus.plexus:plexus-utils:3.0.24'
compile "org.apache.logging.log4j:log4j-core:2.11.0"
compile('org.vafer:jdependency:2.1.1') {
implementation 'org.jdom:jdom2:2.0.6'
implementation 'org.ow2.asm:asm:7.0-beta'
implementation 'org.ow2.asm:asm-commons:7.0-beta'
implementation 'commons-io:commons-io:2.5'
implementation 'org.apache.ant:ant:1.9.7'
implementation 'org.codehaus.plexus:plexus-utils:3.0.24'
implementation "org.apache.logging.log4j:log4j-core:2.11.0"
implementation('org.vafer:jdependency:2.1.1') {
exclude group: 'org.ow2.asm'
}

testCompile("org.spockframework:spock-core:1.0-groovy-2.4") {
testImplementation("org.spockframework:spock-core:1.0-groovy-2.4") {
exclude module: 'groovy-all'
}
testCompile 'xmlunit:xmlunit:1.3'
testCompile 'commons-lang:commons-lang:2.6'
testCompile 'com.google.guava:guava:17.0'
testImplementation 'xmlunit:xmlunit:1.3'
testImplementation 'commons-lang:commons-lang:2.6'
testImplementation 'com.google.guava:guava:17.0'
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions src/main/groovy/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer;
import org.gradle.api.Action;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.file.DuplicatesStrategy;
import org.gradle.api.file.FileCollection;
import org.gradle.api.internal.DocumentationRegistry;
import org.gradle.api.internal.file.FileResolver;
Expand Down Expand Up @@ -39,6 +40,7 @@ public class ShadowJar extends Jar implements ShadowSpec {

public ShadowJar() {
super();
setDuplicatesStrategy(DuplicatesStrategy.INCLUDE); //shadow filters out files later. This was the default behavior in Gradle < 6.x
versionUtil = new GradleVersionUtil(getProject().getGradle().getGradleVersion());
dependencyFilter = new DefaultDependencyFilter(getProject());
dependencyFilterForMinimize = new MinimizeDependencyFilter(getProject());
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class ShadowPluginSpec extends PluginSpecification {
assert output.exists()

where:
version << ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5']
version << ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6']
}

def 'Error in Gradle versions < 5.0'() {
Expand Down