From d2e7e3be4e706668639c4bf356ca7069a952a504 Mon Sep 17 00:00:00 2001
From: Roman Isko <iskoroman@gmail.com>
Date: Fri, 28 Sep 2018 14:02:04 +0300
Subject: [PATCH 1/3] resolve only resolvable configurations

---
 build.gradle | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c3433cc..c57e9be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -238,6 +238,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"
+            }
+        }
     }
 }

From 58bf9aafb9353c684f2ba57a8758392bc26764cb Mon Sep 17 00:00:00 2001
From: patrickadler <patrick.adler@cegeka.de>
Date: Thu, 4 Apr 2019 11:11:41 +0200
Subject: [PATCH 2/3] Update Gradle to 5.3.1

---
 build.gradle                             | 18 +++++++++---------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index c3433cc..ab32e5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'com.gradle.build-scan' version '1.8'
-    id "com.gradle.plugin-publish" version "0.9.4"
-    id "com.jfrog.bintray" version "1.6"
+    id 'com.gradle.build-scan' version '2.2.1'
+    id "com.gradle.plugin-publish" version "0.10.1"
+    id "com.jfrog.bintray" version "1.8.4"
 }
 apply plugin: 'groovy'
 apply plugin: 'maven'
@@ -10,8 +10,8 @@ apply plugin: 'signing'
 apply plugin: 'jacoco'
 apply plugin: 'project-report'
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 
 defaultTasks 'clean', 'build'
 
@@ -21,8 +21,8 @@ ext.archivesBaseName = 'gradle-js-plugin'
 ext.isSnapshot = version.endsWith("-SNAPSHOT")
 
 buildScan {
-    licenseAgreementUrl = 'https://gradle.com/terms-of-service'
-    licenseAgree = 'yes'
+    termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+    termsOfServiceAgree = 'yes'
 }
 
 repositories {
@@ -143,7 +143,7 @@ test {
 }
 
 jacoco {
-    toolVersion = "0.7.6.201602180812"
+    toolVersion = "0.8.3"
     reportsDir = file("$buildDir/customJacocoReportDir")
 }
 
@@ -151,7 +151,7 @@ jacocoTestReport {
     reports {
         xml.enabled false
         csv.enabled false
-        html.destination "${buildDir}/jacocoHtml"
+        html.destination file("${buildDir}/jacocoHtml")
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e680f3..dbc5d06 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip

From c38b144f470de9ad60ce5e96ccae9ce9e722dbca Mon Sep 17 00:00:00 2001
From: patrickadler <patrick.adler@cegeka.de>
Date: Thu, 4 Apr 2019 11:12:24 +0200
Subject: [PATCH 3/3] Remove use of deprecated API

---
 .../source/internal/DefaultJavaScriptSourceSetContainer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/groovy/com/eriwen/gradle/js/source/internal/DefaultJavaScriptSourceSetContainer.java b/src/main/groovy/com/eriwen/gradle/js/source/internal/DefaultJavaScriptSourceSetContainer.java
index 8b8f2f7..2c631cb 100644
--- a/src/main/groovy/com/eriwen/gradle/js/source/internal/DefaultJavaScriptSourceSetContainer.java
+++ b/src/main/groovy/com/eriwen/gradle/js/source/internal/DefaultJavaScriptSourceSetContainer.java
@@ -4,6 +4,7 @@
 import com.eriwen.gradle.js.source.JavaScriptSourceSetContainer;
 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 DefaultJavaScriptSourceSetContainer extends AbstractNamedDomainObje
     private final FileResolver fileResolver;
 
     public DefaultJavaScriptSourceSetContainer(Project project, Instantiator instantiator, FileResolver fileResolver) {
-        super(JavaScriptSourceSet.class, instantiator);
+        super(JavaScriptSourceSet.class, instantiator, CollectionCallbackActionDecorator.NOOP);
         this.project = project;
         this.instantiator = instantiator;
         this.fileResolver = fileResolver;