From e6356c239bbde3e329bc70f02d1e76e08b3dcaee Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 24 Oct 2014 12:47:11 +0400 Subject: [PATCH] JS backend: JpsJsModuleUtils: remove filtering for Kotlin Javascript libraries Original commit: f5d957445ffd86edbd5509932c18a58760bcf8ee --- .../src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java index 90032353e32..f03b8fb9430 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.jps.build; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.java.JpsJavaModuleType; @@ -29,7 +28,6 @@ import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.jps.util.JpsPathUtil; -import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -49,11 +47,7 @@ class JpsJsModuleUtils { Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - String path = JpsPathUtil.urlToPath(root.getUrl()); - // TODO: Do we need to add to dependency all libraries? - if (LibraryUtils.isJsRuntimeLibrary(new File(path))) { - result.add(path); - } + result.add(JpsPathUtil.urlToPath(root.getUrl())); } } }