From b556adf8dbbfdedb64ab42d2b682ceaf8176039e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 31 Aug 2016 20:52:58 +0300
Subject: [PATCH] Move/alias Appendable and StringBuilder to kotlin.text
 #KT-2084

---
 .../src/kotlin/text/TypeAliases.kt            | 20 +++++++++++++++++++
 .../src/core/{javalang.kt => text.kt}         |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 core/runtime.jvm/src/kotlin/text/TypeAliases.kt
 rename js/js.libraries/src/core/{javalang.kt => text.kt} (98%)

diff --git a/core/runtime.jvm/src/kotlin/text/TypeAliases.kt b/core/runtime.jvm/src/kotlin/text/TypeAliases.kt
new file mode 100644
index 00000000000..d42b2d20f87
--- /dev/null
+++ b/core/runtime.jvm/src/kotlin/text/TypeAliases.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.text
+
+@SinceKotlin("1.1") public typealias Appendable = java.lang.Appendable
+@SinceKotlin("1.1") public typealias StringBuilder = java.lang.StringBuilder
diff --git a/js/js.libraries/src/core/javalang.kt b/js/js.libraries/src/core/text.kt
similarity index 98%
rename from js/js.libraries/src/core/javalang.kt
rename to js/js.libraries/src/core/text.kt
index 4ac67125812..76023676bdf 100644
--- a/js/js.libraries/src/core/javalang.kt
+++ b/js/js.libraries/src/core/text.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package java.lang
+package kotlin.text
 
 
 interface Appendable {