Merge pull request #2 from Ashampoo/alternative_entrypoints

Use non-standard entry point for native to prevent interference.
Ashampoo · Jul 7, 2023 · 236063f · 236063f
2 parents dd1f677 + 847b686
commit 236063f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -128,9 +128,9 @@ kotlin {
 
     mingwX64("win") {
         binaries {
-            executable(
-                buildTypes = setOf(NativeBuildType.RELEASE)
-            )
+            executable(setOf(NativeBuildType.RELEASE)) {
+                entryPoint = "com.ashampoo.xmp.main"
+            }
         }
     }
 
@@ -191,15 +191,12 @@ kotlin {
         macosArm64()
     ).forEach {
 
-        it.binaries.executable(
-            buildTypes = setOf(NativeBuildType.RELEASE)
-        ) {
+        it.binaries.executable(setOf(NativeBuildType.RELEASE)) {
             baseName = "xmpcore"
+            entryPoint = "com.ashampoo.xmp.main"
         }
 
-        it.binaries.framework(
-            buildTypes = setOf(NativeBuildType.RELEASE)
-        ) {
+        it.binaries.framework(setOf(NativeBuildType.RELEASE)) {
             baseName = "xmpcore"
             /* Part of the XCFramework */
             xcf.add(this)

diff --git a/src/commonMain/kotlin/com/ashampoo/xmp/impl/XMPIteratorImpl.kt b/src/commonMain/kotlin/com/ashampoo/xmp/impl/XMPIteratorImpl.kt
@@ -71,7 +71,7 @@ class XMPIteratorImpl(
         this.options = options ?: IteratorOptions()
 
         // the start node of the iteration depending on the schema and property filter
-        var startNode: XMPNode? = null
+        var startNode: XMPNode?
         var initialPath: String? = null
         val baseSchema = !schemaNS.isNullOrEmpty()
         val baseProperty = !propPath.isNullOrEmpty()

diff --git a/src/posixMain/kotlin/PosixByteArrayReader.kt → .../com/ashampoo/xmp/PosixByteArrayReader.kt b/src/posixMain/kotlin/PosixByteArrayReader.kt → .../com/ashampoo/xmp/PosixByteArrayReader.kt
@@ -1,3 +1,5 @@
+package com.ashampoo.xmp
+
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.UnsafeNumber
 import kotlinx.cinterop.memScoped

diff --git a/src/posixMain/kotlin/main.kt → ...posixMain/kotlin/com/ashampoo/xmp/main.kt b/src/posixMain/kotlin/main.kt → ...posixMain/kotlin/com/ashampoo/xmp/main.kt
@@ -1,4 +1,5 @@
-import com.ashampoo.xmp.XMPMetaFactory
+package com.ashampoo.xmp
+
 import com.ashampoo.xmp.options.SerializeOptions
 import platform.posix.perror