From 92c4ccc65f209cfce3b6ac3c6e2837bc2319aef3 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 23 Apr 2020 00:52:14 +0300
Subject: [PATCH] Allow customizing compilation classpath for JPMS module-info
 build

---
 libraries/commonConfiguration.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 686a9479154..68c3f3c9e34 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -63,6 +63,7 @@ ext.configureJvm6Project = { Project project ->
 ext.compileJava9Sources = { Project project, String moduleName, Collection<FileCollection> moduleOutputs = [project.sourceSets.main.output] ->
     // module-info.java should be in java9 source set by convention
     SourceDirectorySet java9SourceSet = project.sourceSets.java9.java
+    project.configurations.java9CompileClasspath.extendsFrom(project.configurations.compileClasspath)
     project.tasks.getByName("compileJava9Java").configure { JavaCompile it ->
         dependsOn(moduleOutputs)
         it.sourceCompatibility = 1.9
@@ -74,7 +75,7 @@ ext.compileJava9Sources = { Project project, String moduleName, Collection<FileC
 
         doFirst {
             def moduleFiles = files(*moduleOutputs)
-            def modulePath = project.configurations.compileClasspath.filter { !(it in moduleFiles.files) }
+            def modulePath = project.configurations.java9CompileClasspath.filter { !(it in moduleFiles.files) }
 
             options.compilerArgs = [
                     '--module-path', modulePath.asPath,