From bcd85aa30d197c57dbc2004f6d1af813f4655220 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 18 Sep 2015 18:44:00 +0300 Subject: [PATCH] changes some internal modifiers to public for elements which are used outside their modules --- .../kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt | 4 ++-- .../kotlin/load/kotlin/reflect/ReflectKotlinClass.kt | 2 +- js/js.libraries/src/core/annotationsJVM.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index e7392ffc0e3..7092254d11a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -388,8 +388,8 @@ class LazyJavaTypeAttributes( private fun hasAnnotation(fqName: FqName) = typeAnnotations.findAnnotation(fqName) != null } -internal fun Annotations.isMarkedNotNull() = findAnnotation(JETBRAINS_NOT_NULL_ANNOTATION) != null -internal fun Annotations.isMarkedNullable() = findAnnotation(JETBRAINS_NULLABLE_ANNOTATION) != null +public fun Annotations.isMarkedNotNull() = findAnnotation(JETBRAINS_NOT_NULL_ANNOTATION) != null +public fun Annotations.isMarkedNullable() = findAnnotation(JETBRAINS_NULLABLE_ANNOTATION) != null fun TypeUsage.toAttributes( allowFlexible: Boolean = true, diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt index 00649c3e56d..aa043f1dbac 100644 --- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt @@ -40,7 +40,7 @@ private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf( ) public class ReflectKotlinClass private constructor( - internal val klass: Class<*>, + public val klass: Class<*>, private val classHeader: KotlinClassHeader ) : KotlinJvmBinaryClass { diff --git a/js/js.libraries/src/core/annotationsJVM.kt b/js/js.libraries/src/core/annotationsJVM.kt index 1569c19e849..22c73c8fb1d 100644 --- a/js/js.libraries/src/core/annotationsJVM.kt +++ b/js/js.libraries/src/core/annotationsJVM.kt @@ -19,9 +19,9 @@ package kotlin.jvm // is used in common generated code in stdlib @Target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) @Retention(AnnotationRetention.SOURCE) -internal annotation class JvmOverloads +public annotation class JvmOverloads @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER, AnnotationTarget.FILE) @Retention(AnnotationRetention.RUNTIME) @MustBeDocumented -internal annotation class JvmName(public val name: String) +public annotation class JvmName(public val name: String)