Move built-ins from package "jet" to "kotlin"

#KT-2896 Fixed

.idea/artifacts/KotlinPlugin.xml

@@ -21,13 +21,13 @@
             <element id="module-output" name="preloader" />
             <element id="module-output" name="serialization" />
             <element id="module-output" name="serialization.java" />
-            <element id="directory" name="jet">
-              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/jet" />
-              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/jet" />
-            </element>
             <element id="module-output" name="backend-common" />
             <element id="library" level="project" name="builtins" />
             <element id="module-output" name="js.dart-ast" />
+            <element id="directory" name="kotlin">
+              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/native/kotlin" />
+              <element id="dir-copy" path="$PROJECT_DIR$/core/builtins/src/kotlin" />
+            </element>
           </element>
           <element id="library" level="project" name="javax.inject" />
           <element id="directory" name="jps">

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java

@@ -52,8 +52,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
     public static final List<ImportPath> DEFAULT_IMPORTS = ImmutableList.of(
             new ImportPath("java.lang.*"),
             new ImportPath("kotlin.*"),
-            new ImportPath("kotlin.io.*"),
+            new ImportPath("kotlin.io.*"));
-            new ImportPath("jet.*"));
 
     private AnalyzerFacadeForJVM() {
     }

core/builtins/native/kotlin/Any.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public open class Any {
     public open fun equals(other: Any?): Boolean

core/builtins/native/kotlin/Arrays.kt

@@ -1,8 +1,8 @@
-package jet
+package kotlin
 
 public fun arrayOfNulls<T>(size : Int) : Array<T?>
 
-public class Array<reified T>(public val size : Int, init : (Int) -> T) {
+public class Array<reified T>(public val size : Int, init : Function1<Int, T>) {
   public fun get(index : Int) : T
   public fun set(index : Int, value : T) : Unit
 

core/builtins/native/kotlin/Char.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public class Char private () : Comparable<Char> {
     public fun compareTo(other : Double) : Int

core/builtins/native/kotlin/Collections.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public trait Iterable<out T> {
     public fun iterator() : Iterator<T>
@@ -146,4 +146,4 @@ public trait MutableMap<K, V> : Map<K, V> {
     public trait MutableEntry<K,V> : Map.Entry<K, V> {
     	public fun setValue(value : V) : V
     }
-}
+}

core/builtins/native/kotlin/Enum.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public abstract class Enum<E: Enum<E>>(name: String, ordinal: Int) {
   public final fun name()    : String

core/builtins/native/kotlin/Iterator.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public trait Iterator<out T> {
     public fun next(): T

core/builtins/native/kotlin/Library.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public trait Annotation
 

core/builtins/native/kotlin/Nothing.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 /**
  * Nothing has no instances

core/builtins/native/kotlin/Numbers.kt

@@ -1,4 +1,4 @@
-package jet
+package kotlin
 
 public abstract class Number {
   public abstract fun toDouble() : Double

core/builtins/src/kotlin/Annotations.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public annotation class data
 

core/builtins/src/kotlin/ExtensionFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait ExtensionFunction0<in T, out R> {
     public fun T.invoke(): R

core/builtins/src/kotlin/Functions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait Function0<out R> {
     public fun invoke(): R

core/builtins/src/kotlin/Inline.kt

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public annotation class noinline
+
 public annotation class inline(public val strategy: InlineStrategy = InlineStrategy.AS_FUNCTION)
+
 public enum class InlineStrategy {
     AS_FUNCTION
     IN_PLACE

core/builtins/src/kotlin/Iterators.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public abstract class ByteIterator : Iterator<Byte> {
     override final fun next() = nextByte()

core/builtins/src/kotlin/KExtensionFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait KExtensionFunction0<in T, out R> : ExtensionFunction0<T, R>
 public trait KExtensionFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>

core/builtins/src/kotlin/KFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait KFunction0<out R> : Function0<R>
 public trait KFunction1<in P1, out R> : Function1<P1, R>

core/builtins/src/kotlin/KMemberFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public trait KMemberFunction0<in T, out R> : ExtensionFunction0<T, R>
 public trait KMemberFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>

core/builtins/src/kotlin/Progression.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public trait Progression<out N : Any> : Iterable<N> {
     public val start: N

core/builtins/src/kotlin/ProgressionIterators.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 import kotlin.internal.getProgressionFinalElement
 

core/builtins/src/kotlin/Progressions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public class ByteProgression(
         public override val start: Byte,

core/builtins/src/kotlin/PropertyMetadata.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public trait PropertyMetadata {
     public val name: String

core/builtins/src/kotlin/Range.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public trait Range<T : Comparable<T>> {
     public val start: T

core/builtins/src/kotlin/Ranges.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package jet
+package kotlin
 
 public class ByteRange(public override val start: Byte, public override val end: Byte) : Range<Byte>, Progression<Byte> {
     override val increment: Int

core/builtins/src/kotlin/Unit.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package jet
+package kotlin
 
 public class Unit private() {
-    override fun toString() = "Unit.VALUE"
+    override fun toString(): String = "Unit.VALUE"
 
     class object {
         public val VALUE: Unit = Unit()

core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java

@@ -40,7 +40,7 @@ import static org.jetbrains.jet.lang.types.lang.PrimitiveType.*;
 public class KotlinBuiltIns {
     public static final JetScope STUB = JetScope.EMPTY;
 
-    public static final String BUILT_INS_PACKAGE_NAME_STRING = "jet";
+    public static final String BUILT_INS_PACKAGE_NAME_STRING = "kotlin";
     public static final Name BUILT_INS_PACKAGE_NAME = Name.identifier(BUILT_INS_PACKAGE_NAME_STRING);
     public static final FqName BUILT_INS_PACKAGE_FQ_NAME = FqName.topLevel(BUILT_INS_PACKAGE_NAME);
 

core/runtime.jvm/src/kotlin/jvm/internal/Intrinsics.java

@@ -16,8 +16,8 @@
 
 package kotlin.jvm.internal;
 
-import jet.Function0;
+import kotlin.Function0;
-import jet.IntRange;
+import kotlin.IntRange;
 import kotlin.KotlinNullPointerException;
 
 import java.util.ArrayList;