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

Fix compilation of :tools:kotlinp-klib and related projects

Browse Source 
Conflicting PRs https://jetbrains.team/p/kt/reviews/14253 and https://jetbrains.team/p/kt/reviews/14384/files
were merged too close to each other for Safe-Merge to catch the problem and therefore resulted in compilation error.
This commit is contained in:
Leonid Startsev
2024-02-15 17:52:42 +01:00
committed by Space Team
parent 460339870a
commit a6cdf27204
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/klib/build.gradle.kts
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
implementation(project(":kotlin-util-klib-abi"))
implementation(project(":tools:kotlinp-klib"))
implementation(project(":kotlinx-metadata-klib")) { isTransitive = false }
implementation(project(":kotlinx-metadata")) { isTransitive = false }
implementation(project(":kotlin-metadata")) { isTransitive = false }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlin-native/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/KotlinpBasedMetadataDumper.kt
+5 -5
View File
@@ -5,11 +5,11 @@
package org.jetbrains.kotlin.cli.klib
import kotlinx.metadata.KmConstructor
import kotlinx.metadata.KmFunction
import kotlinx.metadata.KmPackage
import kotlinx.metadata.KmProperty
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.KmConstructor
import kotlin.metadata.KmFunction
import kotlin.metadata.KmPackage
import kotlin.metadata.KmProperty
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.KlibModuleMetadata
import kotlinx.metadata.klib.className
import kotlinx.metadata.klib.fqName
libraries/tools/kotlinp/klib/build.gradle.kts
+2 -2
View File
@@ -4,14 +4,14 @@ plugins {
}
dependencies {
compileOnly(project(":kotlinx-metadata"))
compileOnly(project(":kotlin-metadata"))
compileOnly(project(":kotlinx-metadata-klib"))
api(project(":tools:kotlinp"))
testApi(intellijCore())
testCompileOnly(project(":kotlinx-metadata"))
testCompileOnly(project(":kotlin-metadata"))
testCompileOnly(project(":kotlinx-metadata-klib"))
testImplementation(libs.junit4)
libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/DeclarationIdOverMetadata.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.kotlinp.klib
import kotlinx.metadata.*
import kotlin.metadata.*
import kotlinx.metadata.klib.KlibEnumEntry
import org.jetbrains.kotlin.kotlinp.klib.TypeArgumentId.VarianceId
libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/ExternalSignatureComputer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.kotlinp.klib
import kotlinx.metadata.*
import kotlin.metadata.*
import kotlinx.metadata.klib.KlibEnumEntry
import kotlinx.metadata.klib.KlibModuleMetadata
import kotlinx.metadata.klib.fqName
libraries/tools/kotlinp/klib/src/org/jetbrains/kotlin/kotlinp/klib/KlibKotlinp.kt
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.kotlinp.klib
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.*
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.*
import org.jetbrains.kotlin.kotlinp.Kotlinp
import org.jetbrains.kotlin.kotlinp.Settings