From f5c7fa9eae79a1aed466a496db859ad53d4bd8d8 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Tue, 22 May 2018 12:37:40 +0300
Subject: [PATCH] improve compatibility with older Gradle versions

---
 .../tooling/util/resolve/CompileDependenciesProvider.java      | 3 ++-
 .../tooling/util/resolve/RuntimeDependenciesProvider.java      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/CompileDependenciesProvider.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/CompileDependenciesProvider.java
index 5a14450ea129..f17700bcc0a4 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/CompileDependenciesProvider.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/CompileDependenciesProvider.java
@@ -3,6 +3,7 @@ package org.jetbrains.plugins.gradle.tooling.util.resolve;
 
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.util.GUtil;
 import org.jetbrains.plugins.gradle.model.ExternalDependency;
@@ -53,7 +54,7 @@ public class CompileDependenciesProvider {
     }
     Set<File> cached = myConfigurationFilesCache.get(key);
     if (cached == null) {
-      cached = key.getResolvedConfiguration().getLenientConfiguration().getFiles();
+      cached = key.getResolvedConfiguration().getLenientConfiguration().getFiles(Specs.SATISFIES_ALL);
       myConfigurationFilesCache.put(key, cached);
     }
     return cached;
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/RuntimeDependenciesProvider.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/RuntimeDependenciesProvider.java
index c99a7621b4d2..f4b071e1e326 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/RuntimeDependenciesProvider.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/RuntimeDependenciesProvider.java
@@ -2,6 +2,7 @@ package org.jetbrains.plugins.gradle.tooling.util.resolve;
 
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.SourceSet;
 import org.jetbrains.plugins.gradle.model.ExternalDependency;
 
@@ -31,7 +32,7 @@ public class RuntimeDependenciesProvider {
 
   public Set<File> getConfigurationFiles() {
     if (myConfigurationFiles == null) {
-      myConfigurationFiles = myConfiguration.getResolvedConfiguration().getLenientConfiguration().getFiles();
+      myConfigurationFiles = myConfiguration.getResolvedConfiguration().getLenientConfiguration().getFiles(Specs.SATISFIES_ALL);
     }
     return myConfigurationFiles;
   }