Use IDEA 143.1960 built with master kotlin branch.

Remove tweaks required to bootstrap packages.
Restore non-star imports of kotlin.text.Charsets.

build.xml

@@ -550,10 +550,7 @@
 
         <javac2 destdir="${output}/classes/compiler" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
                 source="${java.target}" target="${java.target}">
-            <withKotlin modulename="kotlin-compiler">
+            <withKotlin modulename="kotlin-compiler"/>
-                <!-- remove after bootstrapping packages -->
-                <compilerarg value="-Xallow-kotlin-package"/>
-            </withKotlin>
             <skip pattern="kotlin/jvm/internal/.*"/>
             <skip pattern="kotlin/Metadata"/>
             <src refid="compilerSources.path"/>

compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java

@@ -20,8 +20,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.*;
+import kotlin.text.Charsets;
-import kotlin.text.*;
 import kotlin.Pair;
 import kotlin.io.FilesKt;
 import org.jetbrains.annotations.NotNull;

compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java

@@ -20,8 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
-import kotlin.*;
+import kotlin.text.Charsets;
-import kotlin.text.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.utils.ExceptionUtilsKt;

compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java

@@ -21,8 +21,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.TestDataFile;
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.util.SmartList;
-import kotlin.*;
+import kotlin.text.Charsets;
-import kotlin.text.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;

compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java

@@ -19,8 +19,7 @@ package org.jetbrains.kotlin.codegen.generated;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
-import kotlin.*;
+import kotlin.text.Charsets;
-import kotlin.text.*;
 import kotlin.io.FilesKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;

core/util.runtime/src/org/jetbrains/kotlin/utils/collectionsPackage.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2015 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.collections
-
-// remove after bootstrapping packages
-public class PackagePlaceholder

core/util.runtime/src/org/jetbrains/kotlin/utils/ranges.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2015 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.ranges
-
-// remove after bootstrapping packages
-public class PackagePlaceholder

update_dependencies.xml

@@ -1,8 +1,8 @@
 <project name="Update Dependencies" default="update_teamcity" xmlns:if="ant:if" xmlns:unless="ant:unless">
 
     <property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
-    <property name="ideaVersion" value="143.1945"/>
+    <property name="ideaVersion" value="143.1960"/>
-    <property name="idea.kotlin.branch" value="rr/stdlib/packages"/>
+    <property name="idea.kotlin.branch" value="&lt;default&gt;"/>
 
 
     <property name="kotlin.bootstrap.branch" value=""/>