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

[K/N] Move kotlin-native/utilities/basic-utils to compiler/utils

Browse Source
This commit is contained in:
Alexander Shabalin
2024-02-02 20:50:18 +01:00
committed by Space Team
parent 3ab6e9de28
commit 4468167a64
30 changed files with 92 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/Interop/Indexer/build.gradle.kts
+1 -1
View File
@@ -139,9 +139,9 @@ sourceSets {
dependencies {
api(project(":kotlin-stdlib"))
api(project(":kotlin-native:Interop:Runtime"))
api(project(":kotlin-native:utilities:basic-utils"))
testImplementation(kotlin("test-junit"))
testImplementation(project(":compiler:util"))
}
val nativelibs = project.tasks.register<Copy>("nativelibs") {
kotlin-native/Interop/Indexer/src/test/kotlin/org/jetbrains/kotlin/native/interop/indexer/IndexerTests.kt
+1 -1
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.native.interop.indexer
import kotlinx.cinterop.JvmCInteropCallbacks
import org.jetbrains.kotlin.konan.util.NativeMemoryAllocator
import org.jetbrains.kotlin.utils.NativeMemoryAllocator
import java.io.File
import kotlin.test.AfterTest
import kotlin.test.BeforeTest
kotlin-native/Interop/Runtime/build.gradle.kts
+1 -1
View File
@@ -47,7 +47,7 @@ native {
}
dependencies {
implementation(project(":kotlin-native:utilities:basic-utils"))
implementation(project(":compiler:util"))
implementation(project(":kotlin-stdlib"))
implementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
}
kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmCallbacks.kt
+2 -2
View File
@@ -16,8 +16,8 @@
package kotlinx.cinterop
import org.jetbrains.kotlin.konan.util.NativeMemoryAllocator
import org.jetbrains.kotlin.konan.util.ThreadSafeDisposableHelper
import org.jetbrains.kotlin.utils.NativeMemoryAllocator
import org.jetbrains.kotlin.utils.ThreadSafeDisposableHelper
import sun.misc.Unsafe
import java.util.concurrent.ConcurrentHashMap
import java.util.function.LongConsumer
kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmNativeMem.kt
+1 -1
View File
@@ -16,7 +16,7 @@
package kotlinx.cinterop
import org.jetbrains.kotlin.konan.util.nativeMemoryAllocator
import org.jetbrains.kotlin.utils.nativeMemoryAllocator
import sun.misc.Unsafe
private val NativePointed.address: Long
kotlin-native/Interop/Runtime/src/jvm/kotlin/kotlinx/cinterop/JvmUtils.kt
+2 -2
View File
@@ -16,7 +16,7 @@
package kotlinx.cinterop
import org.jetbrains.kotlin.konan.util.KonanHomeProvider
import org.jetbrains.kotlin.utils.KotlinNativePaths
import java.io.File
import java.nio.file.Files
import java.nio.file.Paths
@@ -192,7 +192,7 @@ fun loadKonanLibrary(name: String) {
for (dir in paths) {
if (tryLoadKonanLibrary(dir, fullLibraryName, runFromDaemon)) return
}
val defaultNativeLibsDir = "${KonanHomeProvider.determineKonanHome()}/konan/nativelib"
val defaultNativeLibsDir = "${KotlinNativePaths.homePath.absolutePath}/konan/nativelib"
if (tryLoadKonanLibrary(defaultNativeLibsDir, fullLibraryName, runFromDaemon))
return
error("Lib $fullLibraryName is not found in $defaultNativeLibsDir and ${paths.joinToString { it }}")
kotlin-native/Interop/StubGenerator/build.gradle.kts
-1
View File
@@ -30,7 +30,6 @@ application {
dependencies {
implementation(project(":kotlin-native:Interop:Indexer"))
implementation(project(":kotlin-native:utilities:basic-utils"))
implementation(project(path = ":kotlin-native:endorsedLibraries:kotlinx.cli", configuration = "jvmRuntimeElements"))
api(project(":kotlin-stdlib"))
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/defFileDependencies.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.native.interop.gen
import kotlinx.cinterop.usingJvmCInteropCallbacks
import org.jetbrains.kotlin.konan.util.DefFile
import org.jetbrains.kotlin.konan.util.usingNativeMemoryAllocator
import org.jetbrains.kotlin.utils.usingNativeMemoryAllocator
import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform
import org.jetbrains.kotlin.native.interop.gen.jvm.buildNativeLibrary
import org.jetbrains.kotlin.native.interop.gen.jvm.prepareTool
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/ToolConfig.kt
+2 -2
View File
@@ -17,13 +17,13 @@
package org.jetbrains.kotlin.native.interop.tool
import org.jetbrains.kotlin.konan.target.*
import org.jetbrains.kotlin.konan.util.KonanHomeProvider
import org.jetbrains.kotlin.utils.KotlinNativePaths
import org.jetbrains.kotlin.konan.target.AbstractToolConfig
import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform
import org.jetbrains.kotlin.native.interop.indexer.Language
class ToolConfig(userProvidedTargetName: String?, flavor: KotlinPlatform, propertyOverrides: Map<String, String>, konanDataDir: String? = null)
: AbstractToolConfig(KonanHomeProvider.determineKonanHome(), userProvidedTargetName, propertyOverrides, konanDataDir) {
: AbstractToolConfig(KotlinNativePaths.homePath.absolutePath, userProvidedTargetName, propertyOverrides, konanDataDir) {
val clang = when (flavor) {
KotlinPlatform.JVM -> platform.clangForJni
kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+3 -3
View File
@@ -29,8 +29,8 @@ import org.jetbrains.kotlin.konan.target.CompilerOutputKind
import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.konan.util.DefFile
import org.jetbrains.kotlin.konan.util.KonanHomeProvider
import org.jetbrains.kotlin.konan.util.usingNativeMemoryAllocator
import org.jetbrains.kotlin.utils.KotlinNativePaths
import org.jetbrains.kotlin.utils.usingNativeMemoryAllocator
import org.jetbrains.kotlin.library.KLIB_PROPERTY_IR_PROVIDER
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.metadata.resolver.TopologicalLibraryOrder
@@ -486,7 +486,7 @@ private fun getLibraryResolver(
repos,
libraries.filter { it.contains(org.jetbrains.kotlin.konan.file.File.separator) },
target,
Distribution(KonanHomeProvider.determineKonanHome(), konanDataDir = cinteropArguments.konanDataDir)
Distribution(KotlinNativePaths.homePath.absolutePath, konanDataDir = cinteropArguments.konanDataDir)
).libraryResolver()
}
kotlin-native/Interop/StubGenerator/src/test/kotlin/org/jetbrains/kotlin/native/interop/gen/InteropTestsBase.kt
+1 -1
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.native.interop.gen
import kotlinx.cinterop.JvmCInteropCallbacks
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.util.DefFile
import org.jetbrains.kotlin.konan.util.NativeMemoryAllocator
import org.jetbrains.kotlin.utils.NativeMemoryAllocator
import org.jetbrains.kotlin.native.interop.gen.jvm.KotlinPlatform
import org.jetbrains.kotlin.native.interop.gen.jvm.buildNativeLibrary
import org.jetbrains.kotlin.native.interop.gen.jvm.prepareTool