Skip to content
This repository has been archived by the owner on Jul 17, 2022. It is now read-only.

Gradle 6.0 compatibility by removing deprecated API #52

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 14 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "com.gradle.plugin-publish" version "0.9.4"
id "com.jfrog.bintray" version "1.6"
id "com.gradle.plugin-publish" version "0.10.1"
id "com.jfrog.bintray" version "1.8.4"
}

apply plugin: 'groovy'
Expand All @@ -10,8 +10,8 @@ apply plugin: 'signing'
apply plugin: 'idea'
apply plugin: 'jacoco'

sourceCompatibility = 1.6
targetCompatibility = 1.6
sourceCompatibility = 1.7
targetCompatibility = 1.7

defaultTasks 'clean', 'build'

Expand Down Expand Up @@ -225,6 +225,14 @@ def getPomConfiguration() {
// download dependencies all at once, keeps downloads out of travis output
task resolveAllDependencies {
doLast {
configurations.all { it.resolve() }
configurations.all { configuration ->
if (configuration.isCanBeResolved()) {
println "Resolving $configuration"
configuration.resolve()
}
else {
println "$configuration is not resolvable"
}
}
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.eriwen.gradle.css.source.CssSourceSetContainer;
import org.gradle.api.Project;
import org.gradle.api.internal.AbstractNamedDomainObjectContainer;
import org.gradle.api.internal.CollectionCallbackActionDecorator;
import org.gradle.api.internal.file.FileResolver;
import org.gradle.internal.reflect.Instantiator;

Expand All @@ -14,7 +15,7 @@ public class DefaultCssSourceSetContainer extends AbstractNamedDomainObjectConta
private final FileResolver fileResolver;

public DefaultCssSourceSetContainer(Project project, Instantiator instantiator, FileResolver fileResolver) {
super(CssSourceSet.class, instantiator);
super(CssSourceSet.class, instantiator, CollectionCallbackActionDecorator.NOOP);
this.project = project;
this.instantiator = instantiator;
this.fileResolver = fileResolver;
Expand Down