diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java index add122e82a2..3345e27227a 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java @@ -79,10 +79,7 @@ public abstract class Config { */ @NotNull public static final List LIB_FILE_NAMES_DEPENDENT_ON_STDLIB = Arrays.asList( - /** - TODO include ASAP... "/stdlib/jutil.kt", - */ "/stdlib/test.kt", "/core/stringDefs.kt", "/core/strings.kt" @@ -96,8 +93,6 @@ public abstract class Config { @NotNull public static final List STDLIB_FILE_NAMES = Arrays.asList( "/kotlin/Preconditions.kt", - /* - TODO include ASAP - right now it generates an issue "/kotlin/Iterators.kt", "/kotlin/JUtil.kt", "/kotlin/JUtilCollections.kt", @@ -105,8 +100,7 @@ public abstract class Config { "/kotlin/JLangIterables.kt", "/kotlin/JLangIterablesLazy.kt", "/kotlin/JLangIterablesSpecial.kt", - "/kotlin/support/AbstractIterator.kt" - */ + "/kotlin/support/AbstractIterator.kt", "/kotlin/Strings.kt", "/kotlin/test/Test.kt" ); diff --git a/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt b/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt index 2ad3a72399c..d4707acadc2 100644 --- a/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt +++ b/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt @@ -78,7 +78,7 @@ public fun java.lang.Iterable.contains(item : T) : Boolean { } for (var elem in this) { - if (elem.equals(item)) { + if (elem == item) { return true } } diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml index 26c73414c9f..f32386fcb67 100644 --- a/libraries/tools/kotlin-js-library/pom.xml +++ b/libraries/tools/kotlin-js-library/pom.xml @@ -68,7 +68,6 @@ -