From 2a598e0ac4737a7fd97e61660ad53c7a3a30cea3 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 5 Dec 2017 17:30:29 +0300 Subject: [PATCH] Replace ReadOnly/Mutable usages in the compiler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace ones from org.jetbrains.kotlin package with new annotations from kotlin.annotations.jvm. No need to copy them to compile kotlin-reflect anymore. Then simplify reflect project more: no sources — no need to pack its direct output. --- compiler/backend/build.gradle.kts | 1 + .../codegen/context/CodegenContext.java | 2 +- .../inline/InternalFinallyBlockInliner.java | 2 +- compiler/frontend/build.gradle.kts | 1 + .../ClassDescriptorWithResolutionScopes.java | 2 +- .../kotlin/resolve/BindingContext.java | 2 +- .../kotlin/resolve/BodiesResolveContext.java | 4 ++-- .../resolve/calls/util/DelegatingCall.java | 2 +- .../kotlin/resolve/lazy/ResolveSession.java | 2 +- .../resolve/lazy/data/KtClassLikeInfo.java | 2 +- .../lazy/descriptors/LazyClassDescriptor.java | 2 +- .../src/org/jetbrains/kotlin/psi/Call.java | 2 +- .../kotlin/psi/KtBlockExpression.java | 2 +- .../kotlin/psi/KtDeclarationContainer.java | 2 +- .../kotlin/psi/KtPureClassOrObject.java | 2 +- core/descriptors.jvm/build.gradle.kts | 1 + .../kotlin/load/java/JavaClassFinder.java | 2 +- core/descriptors/build.gradle.kts | 1 + .../descriptors/CallableDescriptor.java | 2 +- .../kotlin/descriptors/ClassDescriptor.java | 2 +- ...lassifierDescriptorWithTypeParameters.java | 2 +- .../impl/PropertyDescriptorImpl.java | 2 +- .../kotlin/resolve/OverridingUtil.java | 2 +- .../kotlin/types/DescriptorSubstitutor.java | 4 ++-- .../kotlin/types/TypeConstructor.java | 2 +- libraries/reflect/build.gradle.kts | 20 +------------------ prepare/compiler/build.gradle.kts | 1 + prepare/compiler/build.gradle.kts.173 | 1 + prepare/compiler/build.gradle.kts.181 | 1 + 29 files changed, 31 insertions(+), 42 deletions(-) diff --git a/compiler/backend/build.gradle.kts b/compiler/backend/build.gradle.kts index b703c1ae298..170b92402c5 100644 --- a/compiler/backend/build.gradle.kts +++ b/compiler/backend/build.gradle.kts @@ -7,6 +7,7 @@ plugins { jvmTarget = "1.6" dependencies { + compile(project(":kotlin-annotations-jvm")) compile(project(":compiler:util")) compile(project(":compiler:backend-common")) compile(project(":compiler:frontend")) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index f5b0a36c0d6..8fb73030d55 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.codegen.context; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java index b1233fb88c1..3c0bd9d54d0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.codegen.inline; import com.google.common.base.Objects; import com.google.common.collect.Lists; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts index a2079fe4b8d..21f211e45ff 100644 --- a/compiler/frontend/build.gradle.kts +++ b/compiler/frontend/build.gradle.kts @@ -7,6 +7,7 @@ plugins { jvmTarget = "1.6" dependencies { + compile(project(":kotlin-annotations-jvm")) compile(project(":core:descriptors")) compile(project(":core:deserialization")) compile(project(":compiler:util")) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java index d241774f38a..97a502f7bfe 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.descriptors; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java index 6ec44fc8f70..da9d12ed685 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java @@ -7,9 +7,9 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.ImmutableMap; import com.intellij.psi.PsiElement; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.cfg.LeakingThisDescriptor; import org.jetbrains.kotlin.cfg.TailRecursionKind; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java index 4286cc5fada..4d0b6bf4f1e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.resolve; -import org.jetbrains.annotations.Mutable; +import kotlin.annotations.jvm.Mutable; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java index 916e2732410..5429205515e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.resolve.calls.util; import com.intellij.lang.ASTNode; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.scopes.receivers.Receiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index ee2589dae6d..784fb3dbac9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.resolve.lazy; import com.google.common.collect.Lists; import com.intellij.openapi.project.Project; import com.intellij.util.containers.ContainerUtil; +import kotlin.annotations.jvm.ReadOnly; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.config.LanguageVersionSettings; import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.descriptors.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java index 654c76c5cad..b1591f0242d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassLikeInfo.java @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.resolve.lazy.data; import com.intellij.psi.PsiElement; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index f5fec1c87b2..a8148d0f431 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -7,11 +7,11 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNameIdentifierOwner; +import kotlin.annotations.jvm.ReadOnly; import kotlin.collections.CollectionsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.config.LanguageFeature; import org.jetbrains.kotlin.descriptors.*; diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/Call.java b/compiler/psi/src/org/jetbrains/kotlin/psi/Call.java index 6856c9cbb9a..a535b4fb8e8 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/Call.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/Call.java @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.resolve.scopes.receivers.Receiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java index 4eda4079416..394d59da4b7 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtBlockExpression.java @@ -20,9 +20,9 @@ import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiModifiableCodeBlock; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.lexer.KtTokens; import java.util.Arrays; diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtDeclarationContainer.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtDeclarationContainer.java index ee5639844d5..8e2747ca83a 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtDeclarationContainer.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtDeclarationContainer.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.psi; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.ReadOnly; import java.util.List; diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPureClassOrObject.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPureClassOrObject.java index b0c2dade269..1c1d7d9bfa7 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtPureClassOrObject.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtPureClassOrObject.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.psi; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import java.util.List; diff --git a/core/descriptors.jvm/build.gradle.kts b/core/descriptors.jvm/build.gradle.kts index 47307375158..ae0a64b550b 100644 --- a/core/descriptors.jvm/build.gradle.kts +++ b/core/descriptors.jvm/build.gradle.kts @@ -7,6 +7,7 @@ jvmTarget = "1.6" javaHome = rootProject.extra["JDK_16"] as String dependencies { + compile(project(":kotlin-annotations-jvm")) compile(project(":core:descriptors")) compile(project(":core:deserialization")) compile(project(":core:metadata.jvm")) diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java index 11b85e20de3..9cb15bb764a 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.load.java; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.load.java.structure.JavaClass; import org.jetbrains.kotlin.load.java.structure.JavaPackage; import org.jetbrains.kotlin.name.ClassId; diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts index b8cfae9417b..6f84640ffa3 100644 --- a/core/descriptors/build.gradle.kts +++ b/core/descriptors/build.gradle.kts @@ -9,6 +9,7 @@ javaHome = rootProject.extra["JDK_16"] as String dependencies { compile(project(":core:util.runtime")) compile(projectDist(":kotlin-stdlib")) + compile(project(":kotlin-annotations-jvm")) } sourceSets { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java index 196690dc641..2b7cd11cff1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.descriptors; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.types.KotlinType; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java index 8fe61f7a63a..7fb5889708f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.descriptors; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.types.SimpleType; import org.jetbrains.kotlin.types.TypeProjection; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java index 3a039ac76ee..59d130ca5f7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.descriptors; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.ReadOnly; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java index 8729fb4c24a..e91ae95fd56 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.descriptors.impl; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.name.Name; diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java index 8b055966b05..e3bd9a07b05 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.resolve; import kotlin.Pair; import kotlin.Unit; +import kotlin.annotations.jvm.Mutable; import kotlin.collections.CollectionsKt; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; -import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java index 008a763b1f6..0bb756907ec 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.types; -import org.jetbrains.annotations.Mutable; +import kotlin.annotations.jvm.Mutable; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.SourceElement; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java index 3728fea5815..0d12226c61a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.types; +import kotlin.annotations.jvm.ReadOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index 8a99a357858..adccca19cd4 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -34,15 +34,9 @@ pill { } val core = "$rootDir/core" -val annotationsSrc = "$buildDir/annotations" val relocatedCoreSrc = "$buildDir/core-relocated" val libsDir = property("libsDir") -sourceSets { - "main" { - java.srcDir(annotationsSrc) - } -} val proguardDeps by configurations.creating val shadows by configurations.creating { @@ -55,6 +49,7 @@ dependencies { compile(projectDist(":kotlin-stdlib")) proguardDeps(project(":kotlin-stdlib")) + proguardDeps(project(":kotlin-annotations-jvm")) proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String)))) shadows(project(":kotlin-reflect-api")) @@ -69,18 +64,6 @@ dependencies { shadows(project(":custom-dependencies:protobuf-lite", configuration = "default")) } -val copyAnnotations by task { - // copy just two missing annotations - from("$core/runtime.jvm/src") { - include("**/Mutable.java") - include("**/ReadOnly.java") - } - into(annotationsSrc) - includeEmptyDirs = false -} - -tasks.getByName("compileJava").dependsOn(copyAnnotations) - class KotlinModuleShadowTransformer(private val logger: Logger) : Transformer { @Suppress("ArrayInDataClass") private data class Entry(val path: String, val bytes: ByteArray) @@ -127,7 +110,6 @@ val reflectShadowJar by task { version = null callGroovy("manifestAttributes", manifest, project, "Main", true) - from(mainSourceSet.output) from(project(":core:descriptors.jvm").mainSourceSet.resources) { include("META-INF/services/**") } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index de078b9f02b..05677acaf6e 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -63,6 +63,7 @@ dependencies { proguardLibraryJars(projectDist(":kotlin-stdlib")) proguardLibraryJars(projectDist(":kotlin-script-runtime")) proguardLibraryJars(projectDist(":kotlin-reflect")) + proguardLibraryJars(project(":kotlin-annotations-jvm")) proguardLibraryJars(projectDist(":kotlin-scripting-common")) proguardLibraryJars(projectDist(":kotlin-scripting-jvm")) diff --git a/prepare/compiler/build.gradle.kts.173 b/prepare/compiler/build.gradle.kts.173 index 56171071a54..24adb8c5fc8 100644 --- a/prepare/compiler/build.gradle.kts.173 +++ b/prepare/compiler/build.gradle.kts.173 @@ -63,6 +63,7 @@ dependencies { proguardLibraryJars(projectDist(":kotlin-stdlib")) proguardLibraryJars(projectDist(":kotlin-script-runtime")) proguardLibraryJars(projectDist(":kotlin-reflect")) + proguardLibraryJars(project(":kotlin-annotations-jvm")) proguardLibraryJars(projectDist(":kotlin-scripting-common")) proguardLibraryJars(projectDist(":kotlin-scripting-jvm")) diff --git a/prepare/compiler/build.gradle.kts.181 b/prepare/compiler/build.gradle.kts.181 index 859dbd402cd..bbf51acf24c 100644 --- a/prepare/compiler/build.gradle.kts.181 +++ b/prepare/compiler/build.gradle.kts.181 @@ -63,6 +63,7 @@ dependencies { proguardLibraryJars(projectDist(":kotlin-stdlib")) proguardLibraryJars(projectDist(":kotlin-script-runtime")) proguardLibraryJars(projectDist(":kotlin-reflect")) + proguardLibraryJars(project(":kotlin-annotations-jvm")) proguardLibraryJars(projectDist(":kotlin-scripting-common")) proguardLibraryJars(projectDist(":kotlin-scripting-jvm"))