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

Merge :core:deserialization:deserialization.common into :core:descriptors.common

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-20 13:49:22 +03:00
parent bbac270b33
commit 5fa80a2f8c
12 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/build.gradle.kts
-1
View File
@@ -10,7 +10,6 @@ dependencies {
compile(project(":core:metadata"))
compile(project(":core:util.runtime"))
compile(project(":core:descriptors"))
compile(project(":core:deserialization:deserialization.common"))
compile(commonDep("javax.inject"))
}
core/deserialization/deserialization.common/build.gradle.kts
-24
View File
@@ -1,24 +0,0 @@
plugins {
kotlin("jvm")
id("jps-compatible")
}
jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:metadata"))
api(project(":core:descriptors.common"))
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java
-37
View File
@@ -1,37 +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 org.jetbrains.kotlin.descriptors;
import org.jetbrains.annotations.NotNull;
public interface SourceElement {
SourceElement NO_SOURCE = new SourceElement() {
@Override
public String toString() {
return "NO_SOURCE";
}
@NotNull
@Override
public SourceFile getContainingFile() {
return SourceFile.NO_SOURCE_FILE;
}
};
@NotNull
SourceFile getContainingFile();
}
core/deserialization/deserialization.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java
-32
View File
@@ -1,32 +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 org.jetbrains.kotlin.descriptors;
import org.jetbrains.annotations.Nullable;
public interface SourceFile {
SourceFile NO_SOURCE_FILE = new SourceFile() {
@Nullable
@Override
public String getName() {
return null;
}
};
@Nullable
String getName();
}
core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt
-16
View File
@@ -1,16 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
import org.jetbrains.kotlin.name.ClassId
data class IncompatibleVersionErrorData<out T : BinaryVersion>(
val actualVersion: T,
val expectedVersion: T,
val filePath: String,
val classId: ClassId
)
core/deserialization/deserialization.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
-25
View File
@@ -1,25 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.serialization.deserialization.descriptors
import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
interface DeserializedContainerSource : SourceElement {
// Non-null if this container is loaded from a class with an incompatible binary version
val incompatibility: IncompatibleVersionErrorData<*>?
// True iff this is container is "invisible" because it's loaded from a pre-release class and this compiler is a release
val isPreReleaseInvisible: Boolean
// True iff this container was compiled by the new IR backend, this compiler is not using the IR backend right now,
// and no additional flags to override this behavior were specified.
val isInvisibleIrDependency: Boolean
// This string should only be used in error messages
val presentableString: String
}