diff --git a/.idea/libraries/annotations.xml b/.idea/libraries/annotations.xml deleted file mode 100644 index cf741900bcf..00000000000 --- a/.idea/libraries/annotations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/kotlin_annotations_ext.xml b/.idea/libraries/kotlin_annotations_ext.xml deleted file mode 100644 index 5d04b2a1c30..00000000000 --- a/.idea/libraries/kotlin_annotations_ext.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index c1c71eff775..69fcb1fa8b0 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,7 +4,6 @@ - diff --git a/build.xml b/build.xml index 5a7146685ff..bc814593859 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,6 @@ - @@ -29,7 +28,6 @@ - @@ -377,7 +375,6 @@ -libraryjars '${rtjar}' -libraryjars '${bootstrap.runtime}' - -libraryjars '${bootstrap.annotations.ext}' -target 1.6 -dontoptimize @@ -509,27 +506,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -609,11 +585,11 @@ + depends="clean,init,prepareDist,preloader,compiler,compilerSources,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/> + depends="clean,init,prepareDist,preloader,compiler_quick,antTools,jdkAnnotations,androidSdkAnnotations,runtime,runtime_sources,jslib,j2kConverter"/> - - - - - - - - - - - diff --git a/compiler/annotations-ext/src/org/jetbrains/annotations/Mutable.java b/compiler/annotations-ext/src/org/jetbrains/annotations/Mutable.java deleted file mode 100644 index e6b85efee5e..00000000000 --- a/compiler/annotations-ext/src/org/jetbrains/annotations/Mutable.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2013 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 org.jetbrains.annotations; - -import java.lang.annotation.*; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.PARAMETER}) -public @interface Mutable { -} diff --git a/compiler/annotations-ext/src/org/jetbrains/annotations/ReadOnly.java b/compiler/annotations-ext/src/org/jetbrains/annotations/ReadOnly.java deleted file mode 100644 index 5ea3b20ad45..00000000000 --- a/compiler/annotations-ext/src/org/jetbrains/annotations/ReadOnly.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2013 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 org.jetbrains.annotations; - -import java.lang.annotation.*; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.METHOD, ElementType.PARAMETER}) -public @interface ReadOnly { -} diff --git a/compiler/frontend/serialization/serialization.iml b/compiler/frontend/serialization/serialization.iml index f383c337370..c458a6fd1ef 100644 --- a/compiler/frontend/serialization/serialization.iml +++ b/compiler/frontend/serialization/serialization.iml @@ -9,10 +9,9 @@ - - + diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml index 32340685071..f92fcb74c9c 100644 --- a/core/descriptor.loader.java/descriptor.loader.java.iml +++ b/core/descriptor.loader.java/descriptor.loader.java.iml @@ -10,7 +10,6 @@ - diff --git a/core/descriptors/descriptors.iml b/core/descriptors/descriptors.iml index 5b73f2110a0..bbd44fe9e51 100644 --- a/core/descriptors/descriptors.iml +++ b/core/descriptors/descriptors.iml @@ -10,7 +10,6 @@ - diff --git a/core/serialization.java/serialization.java.iml b/core/serialization.java/serialization.java.iml index 9a5bb30d03b..9338ee69201 100644 --- a/core/serialization.java/serialization.java.iml +++ b/core/serialization.java/serialization.java.iml @@ -9,7 +9,6 @@ - diff --git a/core/util.runtime/util.runtime.iml b/core/util.runtime/util.runtime.iml index cd88404a500..4815fceb3bf 100644 --- a/core/util.runtime/util.runtime.iml +++ b/core/util.runtime/util.runtime.iml @@ -9,7 +9,6 @@ -