azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ReadOnly/Mutable usages in the compiler

Browse Source 
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.
This commit is contained in:
Ilya Gorbunov
2017-12-05 17:30:29 +03:00
parent 1bfb75a51b
commit 2a598e0ac4
29 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/build.gradle.kts
+1
View File
@@ -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"))
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java
+1 -1
View File
@@ -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;
core/descriptors/build.gradle.kts
+1
View File
@@ -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 {
core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java
+1 -1
View File
@@ -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;
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java
+1 -1
View File
@@ -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;
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptorWithTypeParameters.java
+1 -1
View File
@@ -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;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java
+1 -1
View File
@@ -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;
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+1 -1
View File
@@ -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.*;
core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java
+2 -2
View File
@@ -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;
core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java
+1 -1
View File
@@ -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;