From ca975e698604adeeaf3a3d694012fa11b217ef32 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Mon, 21 May 2018 16:03:06 +0300
Subject: [PATCH] use lenient configurations to retrieve files

---
 .../util/resolve/CompileDependenciesProvider.java      |  2 +-
 .../tooling/util/resolve/DependencyResolverImpl.java   | 10 ++++------
 .../util/resolve/RuntimeDependenciesProvider.java      |  2 +-
 3 files changed, 6 insertions(+), 8 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 159e57598727..5a14450ea129 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
@@ -53,7 +53,7 @@ public class CompileDependenciesProvider {
     }
     Set<File> cached = myConfigurationFilesCache.get(key);
     if (cached == null) {
-      cached = key.getFiles();
+      cached = key.getResolvedConfiguration().getLenientConfiguration().getFiles();
       myConfigurationFilesCache.put(key, cached);
     }
     return cached;
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResolverImpl.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResolverImpl.java
index 8ba04ac7a1b5..29a309e4be9e 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResolverImpl.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/resolve/DependencyResolverImpl.java
@@ -478,16 +478,14 @@ public class DependencyResolverImpl implements DependencyResolver {
     Collection<File> resolvedFiles = getFiles(dep);
 
     boolean checkCompileOnlyDeps = compileDependenciesProvider.getCompileClasspathConfiguration() != null;
-    final Set<File> compileConfigurationFiles = compileDependenciesProvider.getCompileConfigurationFiles();
-    final Set<File> compileOnlyConfigurationFiles = compileDependenciesProvider.getCompileOnlyConfigurationFiles();
-    final Set<File> deprecatedCompileConfigurationFiles = compileDependenciesProvider.getDeprecatedCompileConfigurationFiles();
 
-    final Set<File> runtimeConfigurationFiles = runtimeDependenciesProvider.getConfigurationFiles();
     // since version 3.4 compileOnly no longer extends compile
     // so, we can use compileOnly configuration for the check
     if (isJavaLibraryPluginSupported) {
+      final Set<File> compileOnlyConfigurationFiles = compileDependenciesProvider.getCompileOnlyConfigurationFiles();
       if (compileOnlyConfigurationFiles != null && compileOnlyConfigurationFiles.containsAll(resolvedFiles)) {
         // deprecated 'compile' configuration still can be used
+        final Set<File> deprecatedCompileConfigurationFiles = compileDependenciesProvider.getDeprecatedCompileConfigurationFiles();
         if (deprecatedCompileConfigurationFiles == null || !deprecatedCompileConfigurationFiles.containsAll(resolvedFiles)) {
           dep.setScope(PROVIDED_SCOPE);
         }
@@ -495,8 +493,8 @@ public class DependencyResolverImpl implements DependencyResolver {
     }
     else {
       if (checkCompileOnlyDeps
-          && !compileConfigurationFiles.containsAll(resolvedFiles)
-          && !runtimeConfigurationFiles.containsAll(resolvedFiles)) {
+          && !compileDependenciesProvider.getCompileConfigurationFiles().containsAll(resolvedFiles)
+          && !runtimeDependenciesProvider.getConfigurationFiles().containsAll(resolvedFiles)) {
         dep.setScope(PROVIDED_SCOPE);
       }
     }
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 5c3dd3b69331..c99a7621b4d2 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
@@ -31,7 +31,7 @@ public class RuntimeDependenciesProvider {
 
   public Set<File> getConfigurationFiles() {
     if (myConfigurationFiles == null) {
-      myConfigurationFiles = myConfiguration.getFiles();
+      myConfigurationFiles = myConfiguration.getResolvedConfiguration().getLenientConfiguration().getFiles();
     }
     return myConfigurationFiles;
   }