From df0a2bcc73cf6c1abd9fc9982c790a225905fbb3 Mon Sep 17 00:00:00 2001 From: patrickadler Date: Thu, 4 Apr 2019 11:19:27 +0200 Subject: [PATCH 1/3] Update Gradle to 4.3.1 --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index a52ac82..dceb97c 100644 --- a/build.gradle +++ b/build.gradle @@ -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' @@ -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' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2cdc49..5b90096 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 From 4efd7c9187f24b84e287911b18d2117d3ec734ba Mon Sep 17 00:00:00 2001 From: patrickadler Date: Thu, 4 Apr 2019 11:19:35 +0200 Subject: [PATCH 2/3] Remove use of deprecated API --- .../css/source/internal/DefaultCssSourceSetContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/com/eriwen/gradle/css/source/internal/DefaultCssSourceSetContainer.java b/src/main/groovy/com/eriwen/gradle/css/source/internal/DefaultCssSourceSetContainer.java index 5a550d9..ac83c49 100644 --- a/src/main/groovy/com/eriwen/gradle/css/source/internal/DefaultCssSourceSetContainer.java +++ b/src/main/groovy/com/eriwen/gradle/css/source/internal/DefaultCssSourceSetContainer.java @@ -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; @@ -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; From 714fcd2f84d9d4f1811d8711c6d382e66f5782c2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 4 Apr 2019 12:29:49 +0200 Subject: [PATCH 3/3] Update build.gradle resolve only resolvable configurations https://github.com/eriwen/gradle-js-plugin/pull/166/commits/d2e7e3be4e706668639c4bf356ca7069a952a504 --- build.gradle | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index dceb97c..1b0c44f 100644 --- a/build.gradle +++ b/build.gradle @@ -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" + } + } } -} \ No newline at end of file +}