diff --git a/build.xml b/build.xml index c897734128d..6f192bc1015 100644 --- a/build.xml +++ b/build.xml @@ -550,10 +550,7 @@ - - - - + diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index a5b5370f1e8..0b8ecccc452 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/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.*; +import kotlin.text.Charsets; import kotlin.Pair; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java index 6120a155412..62f7543ea79 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java +++ b/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.*; +import kotlin.text.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 7a77c2dd73f..3aff216b0f1 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/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.*; +import kotlin.text.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index dcd56f4ac6a..8eaf0df9f04 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/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.*; +import kotlin.text.Charsets; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/collectionsPackage.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/collectionsPackage.kt deleted file mode 100644 index ac9a1a15fa3..00000000000 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/collectionsPackage.kt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/ranges.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/ranges.kt deleted file mode 100644 index d2344ec2727..00000000000 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/ranges.kt +++ /dev/null @@ -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 \ No newline at end of file diff --git a/update_dependencies.xml b/update_dependencies.xml index 99ddea90440..bbcc24a5491 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -1,8 +1,8 @@ - - + +