diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt index bb09db73c53..8508b23afa0 100644 --- a/libraries/stdlib/src/kotlin/dom/Dom.kt +++ b/libraries/stdlib/src/kotlin/dom/Dom.kt @@ -312,7 +312,7 @@ public fun NodeList?.toXmlString(xmlDeclaration: Boolean = false): String { /** Converts the collection of nodes to an XML String */ public fun nodesToXmlString(nodes: Iterable, xmlDeclaration: Boolean = false): String { - return nodes.map { it.toXmlString(xmlDeclaration) }.join() + return nodes.map { it.toXmlString(xmlDeclaration) }.joinToString() } // Syntax sugar diff --git a/libraries/stdlib/src/kotlin/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt index 06a5d2e2800..039fdc9cc50 100644 --- a/libraries/stdlib/src/kotlin/dom/DomJVM.kt +++ b/libraries/stdlib/src/kotlin/dom/DomJVM.kt @@ -162,7 +162,7 @@ public val Node.innerHTML: String * Returns the HTML representation of the nodes */ public val NodeList.outerHTML: String - get() = toList().map { it.innerHTML }.join("") + get() = toList().map { it.innerHTML }.joinToString("") /** Returns an [Iterator] of all the next [Element] siblings */ public fun Node.nextElements(): List = nextSiblings().filterIsInstance() @@ -183,7 +183,7 @@ public var Element.classSet: MutableSet return answer } set(value) { - this.classes = value.join(" ") + this.classes = value.joinToString(" ") } diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index 5a7f9cf77de..efd559f7f3e 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -230,6 +230,7 @@ public fun String.substring(range: IntRange): String = substring(range.start, ra * If the collection could be huge, you can specify a non-negative value of [limit], in which case only the first [limit] * elements will be appended, followed by the [truncated] string (which defaults to "..."). */ +@Deprecated("Use joinToString instead.", ReplaceWith("joinToString(separator, prefix, postfix, limit, truncated)")) public fun Iterable.join(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { return joinToString(separator, prefix, postfix, limit, truncated) } @@ -239,6 +240,7 @@ public fun Iterable.join(separator: String = ", ", prefix: String = "", * If the array could be huge, you can specify a non-negative value of [limit], in which case only the first [limit] * elements will be appended, followed by the [truncated] string (which defaults to "..."). */ +@Deprecated("Use joinToString instead.", ReplaceWith("joinToString(separator, prefix, postfix, limit, truncated)")) public fun Array.join(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { return joinToString(separator, prefix, postfix, limit, truncated) } @@ -248,6 +250,7 @@ public fun Array.join(separator: String = ", ", prefix: String = "", pos * If the stream could be huge, you can specify a non-negative value of [limit], in which case only the first [limit] * elements will be appended, followed by the [truncated] string (which defaults to "..."). */ +@Deprecated("Use joinToString instead.", ReplaceWith("joinToString(separator, prefix, postfix, limit, truncated)")) public fun Sequence.join(separator: String = ", ", prefix: String = "", postfix: String = "", limit: Int = -1, truncated: String = "..."): String { return joinToString(separator, prefix, postfix, limit, truncated) } diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index 3b291962f30..e6e28cc4e78 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -14,13 +14,13 @@ class CollectionTest { assertEquals("{foo-bar}", buffer.toString()) } - @test fun join() { + @test fun joinToString() { val data = listOf("foo", "bar") - val text = data.join("-", "<", ">") + val text = data.joinToString("-", "<", ">") assertEquals("", text) val big = listOf("a", "b", "c", "d", "e", "f") - val text2 = big.join(limit = 3, truncated = "*") + val text2 = big.joinToString(limit = 3, truncated = "*") assertEquals("a, b, c, *", text2) } diff --git a/libraries/stdlib/test/collections/ListSpecificTest.kt b/libraries/stdlib/test/collections/ListSpecificTest.kt index 1ce7d7c9285..4cf328ad853 100644 --- a/libraries/stdlib/test/collections/ListSpecificTest.kt +++ b/libraries/stdlib/test/collections/ListSpecificTest.kt @@ -64,7 +64,7 @@ class ListSpecificTest { } assertEquals(3, list.size()) - assertEquals("beverage,location,name", list.join(",")) + assertEquals("beverage,location,name", list.joinToString(",")) } @Test diff --git a/libraries/stdlib/test/collections/MapTest.kt b/libraries/stdlib/test/collections/MapTest.kt index c2ced15078f..49c02b6a9ef 100644 --- a/libraries/stdlib/test/collections/MapTest.kt +++ b/libraries/stdlib/test/collections/MapTest.kt @@ -83,7 +83,7 @@ class MapTest { } assertEquals(6, list.size()) - assertEquals("beverage,beer,location,Mells,name,James", list.join(",")) + assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(",")) } @test fun stream() { @@ -101,7 +101,7 @@ class MapTest { } assertEquals(6, list.size()) - assertEquals("beverage,beer,location,Mells,name,James", list.join(",")) + assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(",")) } @test fun iterateWithExtraction() { @@ -113,7 +113,7 @@ class MapTest { } assertEquals(6, list.size()) - assertEquals("beverage,beer,location,Mells,name,James", list.join(",")) + assertEquals("beverage,beer,location,Mells,name,James", list.joinToString(",")) } @test fun contains() { diff --git a/libraries/stdlib/test/language/StringExpressionExampleTest.kt b/libraries/stdlib/test/language/StringExpressionExampleTest.kt index 58d78882408..8f5e3293a8a 100644 --- a/libraries/stdlib/test/language/StringExpressionExampleTest.kt +++ b/libraries/stdlib/test/language/StringExpressionExampleTest.kt @@ -15,7 +15,7 @@ fun customerTemplate(customer: Customer) = """

Hello ${customer.name}

    -${customer.products.map{ productSnippet(it) }.join("\n")} +${customer.products.map{ productSnippet(it) }.joinToString("\n")}

lets do some kool stuff

diff --git a/libraries/stdlib/test/text/StringJVMTest.kt b/libraries/stdlib/test/text/StringJVMTest.kt index 35a90e7b511..a829278d342 100644 --- a/libraries/stdlib/test/text/StringJVMTest.kt +++ b/libraries/stdlib/test/text/StringJVMTest.kt @@ -251,11 +251,11 @@ class StringJVMTest { @test fun join() { val data = "abcd".map { it.toString() } - val result = data.join("_", "(", ")") + val result = data.joinToString("_", "(", ")") assertEquals("(a_b_c_d)", result) val data2 = "verylongstring".map { it.toString() } - val result2 = data2.join("-", "[", "]", 11, "oops") + val result2 = data2.joinToString("-", "[", "]", 11, "oops") assertEquals("[v-e-r-y-l-o-n-g-s-t-r-oops]", result2) } diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 637c500c014..fa8c1304525 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -278,7 +278,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile", "T?>") else receiver).renderType()