diff --git a/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt b/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt index 996a676b1fd..bf2de5a77aa 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt +++ b/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt @@ -6,7 +6,7 @@ package org.jetbrains.analyzer import org.w3c.xhr.* -import kotlin.browser.* +import kotlinx.browser.* import kotlin.js.* actual fun readFile(fileName: String): String { diff --git a/kotlin-native/tools/performance-server/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt b/kotlin-native/tools/performance-server/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt index 5494cd550b0..ebed92a1527 100644 --- a/kotlin-native/tools/performance-server/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt +++ b/kotlin-native/tools/performance-server/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt @@ -6,7 +6,7 @@ package org.jetbrains.analyzer import org.w3c.xhr.* -import kotlin.browser.* +import kotlinx.browser.* import kotlin.js.* actual fun readFile(fileName: String): String { diff --git a/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt b/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt index 1229b7a9cc2..730516dd892 100644 --- a/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt +++ b/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt @@ -3,7 +3,7 @@ * that can be found in the LICENSE file. */ -import kotlin.browser.* +import kotlinx.browser.* import org.w3c.fetch.* import org.jetbrains.report.json.* import org.jetbrains.buildInfo.Build diff --git a/libraries/examples/browser-example-with-library/src/main/kotlin/sample/Hello.kt b/libraries/examples/browser-example-with-library/src/main/kotlin/sample/Hello.kt index c66b97b6c70..428452cf604 100644 --- a/libraries/examples/browser-example-with-library/src/main/kotlin/sample/Hello.kt +++ b/libraries/examples/browser-example-with-library/src/main/kotlin/sample/Hello.kt @@ -1,7 +1,7 @@ package sample import kotlin.Pair -import kotlin.browser.document +import kotlinx.browser.document import library.sample.* import kotlin.js.Date diff --git a/libraries/examples/browser-example/src/main/kotlin/sample/Hello.kt b/libraries/examples/browser-example/src/main/kotlin/sample/Hello.kt index c301a6662d5..ed8e337dc92 100644 --- a/libraries/examples/browser-example/src/main/kotlin/sample/Hello.kt +++ b/libraries/examples/browser-example/src/main/kotlin/sample/Hello.kt @@ -1,6 +1,6 @@ package sample -import kotlin.browser.document +import kotlinx.browser.document fun myApp() { val element = document.getElementById("foo") diff --git a/libraries/stdlib/api/js-v1/kotlin.browser.kt b/libraries/stdlib/api/js-v1/kotlin.browser.kt index e14e1e0d1d3..52dd73dd7e0 100644 --- a/libraries/stdlib/api/js-v1/kotlin.browser.kt +++ b/libraries/stdlib/api/js-v1/kotlin.browser.kt @@ -1,19 +1,19 @@ @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.document' instead.", replaceWith = kotlin.ReplaceWith(expression = "document", imports = {"kotlinx.browser.document"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val document: org.w3c.dom.Document { get; } @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.localStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "localStorage", imports = {"kotlinx.browser.localStorage"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val localStorage: org.w3c.dom.Storage { get; } @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.sessionStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "sessionStorage", imports = {"kotlinx.browser.sessionStorage"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val sessionStorage: org.w3c.dom.Storage { get; } @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.window' instead.", replaceWith = kotlin.ReplaceWith(expression = "window", imports = {"kotlinx.browser.window"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val window: org.w3c.dom.Window { get; } \ No newline at end of file diff --git a/libraries/stdlib/api/js-v1/kotlin.dom.kt b/libraries/stdlib/api/js-v1/kotlin.dom.kt index 677f40c4636..9060018196d 100644 --- a/libraries/stdlib/api/js-v1/kotlin.dom.kt +++ b/libraries/stdlib/api/js-v1/kotlin.dom.kt @@ -1,44 +1,44 @@ @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isElement", imports = {"kotlinx.dom.isElement"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public val org.w3c.dom.Node.isElement: kotlin.Boolean { get; } @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isText", imports = {"kotlinx.dom.isText"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public val org.w3c.dom.Node.isText: kotlin.Boolean { get; } @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.addClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.addClass(cssClasses)", imports = {"kotlinx.dom.addClass"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendElement(name, init)", imports = {"kotlinx.dom.appendElement"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.appendElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendText(text)", imports = {"kotlinx.dom.appendText"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.clear' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.clear()", imports = {"kotlinx.dom.clear"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Node.clear(): kotlin.Unit @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.createElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.createElement(name, init)", imports = {"kotlinx.dom.createElement"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Document.createElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.hasClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.hasClass(cssClass)", imports = {"kotlinx.dom.hasClass"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.removeClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.removeClass(cssClasses)", imports = {"kotlinx.dom.removeClass"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file diff --git a/libraries/stdlib/api/js/kotlin.browser.kt b/libraries/stdlib/api/js/kotlin.browser.kt index e14e1e0d1d3..52dd73dd7e0 100644 --- a/libraries/stdlib/api/js/kotlin.browser.kt +++ b/libraries/stdlib/api/js/kotlin.browser.kt @@ -1,19 +1,19 @@ @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.document' instead.", replaceWith = kotlin.ReplaceWith(expression = "document", imports = {"kotlinx.browser.document"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val document: org.w3c.dom.Document { get; } @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.localStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "localStorage", imports = {"kotlinx.browser.localStorage"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val localStorage: org.w3c.dom.Storage { get; } @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.sessionStorage' instead.", replaceWith = kotlin.ReplaceWith(expression = "sessionStorage", imports = {"kotlinx.browser.sessionStorage"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val sessionStorage: org.w3c.dom.Storage { get; } @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.browser.window' instead.", replaceWith = kotlin.ReplaceWith(expression = "window", imports = {"kotlinx.browser.window"})) @kotlin.internal.LowPriorityInOverloadResolution -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public external val window: org.w3c.dom.Window { get; } \ No newline at end of file diff --git a/libraries/stdlib/api/js/kotlin.dom.kt b/libraries/stdlib/api/js/kotlin.dom.kt index 677f40c4636..9060018196d 100644 --- a/libraries/stdlib/api/js/kotlin.dom.kt +++ b/libraries/stdlib/api/js/kotlin.dom.kt @@ -1,44 +1,44 @@ @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isElement", imports = {"kotlinx.dom.isElement"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public val org.w3c.dom.Node.isElement: kotlin.Boolean { get; } @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.isText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.isText", imports = {"kotlinx.dom.isText"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public val org.w3c.dom.Node.isText: kotlin.Boolean { get; } @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.addClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.addClass(cssClasses)", imports = {"kotlinx.dom.addClass"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.addClass(vararg cssClasses: kotlin.String): kotlin.Boolean @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendElement(name, init)", imports = {"kotlinx.dom.appendElement"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.appendElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.appendText' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.appendText(text)", imports = {"kotlinx.dom.appendText"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.appendText(text: kotlin.String): org.w3c.dom.Element @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.clear' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.clear()", imports = {"kotlinx.dom.clear"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Node.clear(): kotlin.Unit @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.createElement' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.createElement(name, init)", imports = {"kotlinx.dom.createElement"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Document.createElement(name: kotlin.String, noinline init: org.w3c.dom.Element.() -> kotlin.Unit): org.w3c.dom.Element @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.hasClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.hasClass(cssClass)", imports = {"kotlinx.dom.hasClass"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.hasClass(cssClass: kotlin.String): kotlin.Boolean @kotlin.internal.LowPriorityInOverloadResolution @kotlin.Deprecated(message = "This API is moved to another package, use 'kotlinx.dom.removeClass' instead.", replaceWith = kotlin.ReplaceWith(expression = "this.removeClass(cssClasses)", imports = {"kotlinx.dom.removeClass"})) -@kotlin.DeprecatedSinceKotlin(warningSince = "1.4") +@kotlin.DeprecatedSinceKotlin(errorSince = "1.6", warningSince = "1.4") public inline fun org.w3c.dom.Element.removeClass(vararg cssClasses: kotlin.String): kotlin.Boolean \ No newline at end of file diff --git a/libraries/stdlib/js/src/kotlin/browser/declarations.kt b/libraries/stdlib/js/src/kotlin/browser/declarations.kt index fbbdde6cd9b..e380dee2fcd 100644 --- a/libraries/stdlib/js/src/kotlin/browser/declarations.kt +++ b/libraries/stdlib/js/src/kotlin/browser/declarations.kt @@ -13,7 +13,7 @@ import kotlin.internal.LowPriorityInOverloadResolution replaceWith = ReplaceWith("window", "kotlinx.browser.window") ) @LowPriorityInOverloadResolution -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public external val window: Window @Deprecated( @@ -21,7 +21,7 @@ public external val window: Window replaceWith = ReplaceWith("document", "kotlinx.browser.document") ) @LowPriorityInOverloadResolution -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public external val document: Document @Deprecated( @@ -29,7 +29,7 @@ public external val document: Document replaceWith = ReplaceWith("localStorage", "kotlinx.browser.localStorage") ) @LowPriorityInOverloadResolution -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public external val localStorage: Storage @Deprecated( @@ -37,6 +37,6 @@ public external val localStorage: Storage replaceWith = ReplaceWith("sessionStorage", "kotlinx.browser.sessionStorage") ) @LowPriorityInOverloadResolution -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public external val sessionStorage: Storage diff --git a/libraries/stdlib/js/src/kotlin/dom/Builders.kt b/libraries/stdlib/js/src/kotlin/dom/Builders.kt index 41032875610..7eb3f1c1cbc 100644 --- a/libraries/stdlib/js/src/kotlin/dom/Builders.kt +++ b/libraries/stdlib/js/src/kotlin/dom/Builders.kt @@ -21,7 +21,7 @@ import kotlinx.dom.createElement as newCreateElement message = "This API is moved to another package, use 'kotlinx.dom.createElement' instead.", replaceWith = ReplaceWith("this.createElement(name, init)", "kotlinx.dom.createElement") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public inline fun Document.createElement(name: String, noinline init: Element.() -> Unit): Element = this.newCreateElement(name, init) /** @@ -34,6 +34,6 @@ public inline fun Document.createElement(name: String, noinline init: Element.() message = "This API is moved to another package, use 'kotlinx.dom.appendElement' instead.", replaceWith = ReplaceWith("this.appendElement(name, init)", "kotlinx.dom.appendElement") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public inline fun Element.appendElement(name: String, noinline init: Element.() -> Unit): Element = this.newAppendElement(name, init) diff --git a/libraries/stdlib/js/src/kotlin/dom/Classes.kt b/libraries/stdlib/js/src/kotlin/dom/Classes.kt index a93d283ea25..d4df0b1d60c 100644 --- a/libraries/stdlib/js/src/kotlin/dom/Classes.kt +++ b/libraries/stdlib/js/src/kotlin/dom/Classes.kt @@ -17,7 +17,7 @@ import kotlinx.dom.removeClass as newRemoveClass message = "This API is moved to another package, use 'kotlinx.dom.hasClass' instead.", replaceWith = ReplaceWith("this.hasClass(cssClass)", "kotlinx.dom.hasClass") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") inline fun Element.hasClass(cssClass: String): Boolean = this.newHasClass(cssClass) /** @@ -30,7 +30,7 @@ inline fun Element.hasClass(cssClass: String): Boolean = this.newHasClass(cssCla message = "This API is moved to another package, use 'kotlinx.dom.addClass' instead.", replaceWith = ReplaceWith("this.addClass(cssClasses)", "kotlinx.dom.addClass") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") inline fun Element.addClass(vararg cssClasses: String): Boolean = this.newAddClass(*cssClasses) /** @@ -43,5 +43,5 @@ inline fun Element.addClass(vararg cssClasses: String): Boolean = this.newAddCla message = "This API is moved to another package, use 'kotlinx.dom.removeClass' instead.", replaceWith = ReplaceWith("this.removeClass(cssClasses)", "kotlinx.dom.removeClass") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") inline fun Element.removeClass(vararg cssClasses: String): Boolean = this.newRemoveClass(*cssClasses) \ No newline at end of file diff --git a/libraries/stdlib/js/src/kotlin/dom/Dom.kt b/libraries/stdlib/js/src/kotlin/dom/Dom.kt index f48d69c345e..78922fc176c 100644 --- a/libraries/stdlib/js/src/kotlin/dom/Dom.kt +++ b/libraries/stdlib/js/src/kotlin/dom/Dom.kt @@ -19,7 +19,7 @@ import kotlinx.dom.isText as newIsText message = "This API is moved to another package, use 'kotlinx.dom.isText' instead.", replaceWith = ReplaceWith("this.isText", "kotlinx.dom.isText") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public val Node.isText: Boolean inline get() = this.newIsText @@ -31,6 +31,6 @@ public val Node.isText: Boolean message = "This API is moved to another package, use 'kotlinx.dom.isElement' instead.", replaceWith = ReplaceWith("this.isElement", "kotlinx.dom.isElement") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public val Node.isElement: Boolean inline get() = this.newIsElement diff --git a/libraries/stdlib/js/src/kotlin/dom/Mutations.kt b/libraries/stdlib/js/src/kotlin/dom/Mutations.kt index c73391e4bc0..1c142f07add 100644 --- a/libraries/stdlib/js/src/kotlin/dom/Mutations.kt +++ b/libraries/stdlib/js/src/kotlin/dom/Mutations.kt @@ -17,7 +17,7 @@ import kotlinx.dom.clear as newClear message = "This API is moved to another package, use 'kotlinx.dom.clear' instead.", replaceWith = ReplaceWith("this.clear()", "kotlinx.dom.clear") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") public inline fun Node.clear() = this.newClear() /** @@ -30,5 +30,5 @@ public inline fun Node.clear() = this.newClear() message = "This API is moved to another package, use 'kotlinx.dom.appendText' instead.", replaceWith = ReplaceWith("this.appendText(text)", "kotlinx.dom.appendText") ) -@DeprecatedSinceKotlin(warningSince = "1.4") +@DeprecatedSinceKotlin(warningSince = "1.4", errorSince = "1.6") inline fun Element.appendText(text: String): Element = this.newAppendText(text) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cleanTask/src/main/kotlin/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cleanTask/src/main/kotlin/main.kt index 7122ecfb838..77fd603f7a9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cleanTask/src/main/kotlin/main.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/cleanTask/src/main/kotlin/main.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -import kotlin.browser.document +import kotlinx.browser.document fun main() { document.write("Hello, world!") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt index f58d7a90055..b2886b3b7c9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/src/main/kotlin/example/library/Counter.kt @@ -1,7 +1,7 @@ package example.library import org.w3c.dom.Text -import kotlin.browser.* +import kotlinx.browser.* public class Counter(val el: Text) { fun step(n: Int) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt index 4315e0e63cb..63470ec6320 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/src/main/kotlin/example/main.kt @@ -1,6 +1,6 @@ package example -import kotlin.browser.document +import kotlinx.browser.document import example.library.Counter diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/src/main/kotlin/Hello.kt b/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/src/main/kotlin/Hello.kt index b16121d53b1..3755cc6ad62 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/src/main/kotlin/Hello.kt +++ b/libraries/tools/maven-archetypes/kotlin-archetype-js/src/main/resources/archetype-resources/src/main/kotlin/Hello.kt @@ -1,6 +1,6 @@ package ${package} -import kotlin.browser.window +import kotlinx.browser.window /** * Example main function. Started at script body.