azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CLI] Restore K2JVMCompilerArguments.classpath and javaModulePath

Browse Source 
to support IDEs < 2023.2

Reverts:
- 9dcd40d7b7
- fb66764c4d

KTIJ-25227
This commit is contained in:
Sebastian Sellmair
2023-04-17 08:25:29 +02:00
committed by Space Team
parent 7fe3c5c423
commit 5d0bf2de24
15 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+5 -6
View File
@@ -165,14 +165,13 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
if (!classpathList.isEmpty()) {
String classPathString = join(classpathList, File.pathSeparator);
String[] classPath = classpathList.toArray(new String[0]);
if (isJava9Module(sourceRoots)) {
getLog().debug("Module path: " + classPathString);
arguments.setJavaModulePath(classPath);
arguments.setJavaModulePath(classPathString);
}
else {
getLog().debug("Classpath: " + classPathString);
arguments.setClasspath(classPath);
arguments.setClasspath(classPathString);
}
}
@@ -256,19 +255,19 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase<K2JVMCompilerArgumen
File classesDir = new File(destination);
File kotlinClassesDir = new File(cachesDir, "classes");
File snapshotsFile = new File(cachesDir, "snapshots.bin");
String[] classpath = arguments.getClasspath();
String classpath = arguments.getClasspath();
MavenICReporter icReporter = new MavenICReporter(getLog());
try {
arguments.setDestination(kotlinClassesDir.getAbsolutePath());
if (classpath != null) {
List<String> filteredClasspath = new ArrayList<>();
for (String path : classpath) {
for (String path : classpath.split(File.pathSeparator)) {
if (!classesDir.equals(new File(path))) {
filteredClasspath.add(path);
}
}
arguments.setClasspath(filteredClasspath.toArray(new String[0]));
arguments.setClasspath(StringUtil.join(filteredClasspath, File.pathSeparator));
}
IncrementalJvmCompilerRunnerKt.makeIncrementally(cachesDir, sourceRoots, arguments, messageCollector, icReporter);