Update used versions.

Author: TadeasKriz

build.gradle.kts

@@ -3,22 +3,24 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
+    alias(libs.plugins.gradle.doctor)
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
 group = "co.touchlab"
 version = "1.2.1"
 
-repositories {
-    mavenCentral()
-}
-
 kotlin {
     listOf(macosX64(), macosArm64()).forEach {
         it.binaries {
             executable {
                 entryPoint = "co.touchlab.xcode.cli.main"
+
+                runTask?.run {
+                    val args = providers.gradleProperty("runArgs")
+                    args(args.getOrElse("").split(' '))
+                }
             }
         }
     }
@@ -65,8 +67,12 @@ kotlin {
 
 tasks.register<Exec>("assembleReleaseExecutableMacos") {
     dependsOn("linkReleaseExecutableMacosX64", "linkReleaseExecutableMacosArm64")
-    commandLine("lipo", "-create", "-o", "xcode-kotlin", "bin/macosX64/releaseExecutable/xcode-kotlin.kexe", "bin/macosArm64/releaseExecutable/xcode-kotlin.kexe")
-    workingDir = buildDir
+    commandLine(
+        "lipo", "-create", "-o", "xcode-kotlin",
+        "bin/macosX64/releaseExecutable/xcode-kotlin.kexe",
+        "bin/macosArm64/releaseExecutable/xcode-kotlin.kexe",
+    )
+    workingDir(layout.buildDirectory)
     group = "build"
     description = "Builds an universal macOS binary for both x86_64 and arm64 architectures."
 }

gradle.properties

@@ -1,3 +1,5 @@
+org.gradle.jvmargs=-XX:+UseParallelGC
+
 kotlin.code.style=official
 kotlin.native.binary.memoryModel=experimental
 kotlin.mpp.stability.nowarn=true

gradle/libs.versions.toml

@@ -1,9 +1,10 @@
 [versions]
-kotlin = "1.6.20"
-kotlinx-coroutines = "1.6.0"
-kotlinx-cli = "0.3.4"
-kotlinx-serialization = "1.3.2"
-kermit = "1.2.0-M1"
+kotlin = "1.9.10"
+kotlinx-coroutines = "1.7.3"
+kotlinx-cli = "0.3.6"
+kotlinx-serialization = "1.6.0"
+kermit = "1.2.2"
+gradle-doctor = "0.8.1"
 
 [libraries]
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
@@ -13,4 +14,6 @@ kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+
+gradle-doctor = { id = "com.osacky.doctor", version.ref = "gradle-doctor" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,4 +1,8 @@
 
 rootProject.name = "xcode-kotlin"
 
-enableFeaturePreview("VERSION_CATALOGS")
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+}

src/macosMain/kotlin/co/touchlab/xcode/cli/XcodeHelper.kt

@@ -196,4 +196,4 @@ object XcodeHelper {
             }
         }
     }
-}
+}

src/macosMain/kotlin/co/touchlab/xcode/cli/util/Console.kt

@@ -1,6 +1,7 @@
 package co.touchlab.xcode.cli.util
 
 import co.touchlab.kermit.Logger
+import kotlinx.cinterop.ExperimentalForeignApi
 import platform.posix.fflush
 import platform.posix.fprintf
 import platform.posix.stderr
@@ -36,8 +37,9 @@ object Console {
         return readLine()
     }
 
+    @OptIn(ExperimentalForeignApi::class)
     fun printError(message: String) {
         fprintf(stderr, message)
         fflush(stderr)
     }
-}
+}

src/macosMain/kotlin/co/touchlab/xcode/cli/util/File.kt

@@ -1,11 +1,7 @@
 package co.touchlab.xcode.cli.util
 
 import co.touchlab.xcode.cli.LLDBInitManager
-import kotlinx.cinterop.ObjCObjectVar
-import kotlinx.cinterop.alloc
-import kotlinx.cinterop.memScoped
-import kotlinx.cinterop.ptr
-import kotlinx.cinterop.value
+import kotlinx.cinterop.*
 import platform.Foundation.NSData
 import platform.Foundation.NSDataWritingAtomic
 import platform.Foundation.NSError
@@ -15,6 +11,7 @@ import platform.Foundation.NSUTF8StringEncoding
 import platform.Foundation.create
 import platform.Foundation.writeToFile
 
+@OptIn(ExperimentalForeignApi::class)
 class File(private val providedPath: Path, private val resolveSymlinks: Boolean = true) {
     val path: Path
         get() = if (resolveSymlinks) {
@@ -24,7 +21,7 @@ class File(private val providedPath: Path, private val resolveSymlinks: Boolean
         }
 
     fun dataContents(): NSData = throwingIOException { errorPointer ->
-        NSData.create(contentsOfFile = path.value, options = 0, error = errorPointer.ptr)
+        NSData.create(contentsOfFile = path.value, options = 0u, error = errorPointer.ptr)
     } ?: error("Couldn't load data contents of file $path. This shouldn't have been thrown, because we should receive a NSError!")
 
     fun stringContents(): NSString = throwingIOException { errorPointer ->
@@ -75,4 +72,4 @@ class File(private val providedPath: Path, private val resolveSymlinks: Boolean
     }
 
     class IOException(val nsError: NSError): Exception(nsError.description)
-}
+}

src/macosMain/kotlin/co/touchlab/xcode/cli/util/PropertyList.kt

@@ -1,11 +1,7 @@
 package co.touchlab.xcode.cli.util
 
 import co.touchlab.kermit.Logger
-import kotlinx.cinterop.ObjCObjectVar
-import kotlinx.cinterop.alloc
-import kotlinx.cinterop.memScoped
-import kotlinx.cinterop.ptr
-import kotlinx.cinterop.value
+import kotlinx.cinterop.*
 import platform.Foundation.NSArray
 import platform.Foundation.NSData
 import platform.Foundation.NSDate
@@ -25,6 +21,7 @@ import platform.Foundation.create
 import platform.Foundation.valueForKey
 import platform.darwin.NSObject
 
+@OptIn(ExperimentalForeignApi::class)
 class PropertyList(val root: Object) {
     enum class Format {
         XML, OpenStep, Binary;
@@ -81,7 +78,7 @@ class PropertyList(val root: Object) {
             val data = NSPropertyListSerialization.dataWithPropertyList(
                 plist = recursiveReverseBridge(root),
                 format = format.objc,
-                options = 0,
+                options = 0u,
                 error = errorPointer.ptr,
             )
             val error = errorPointer.value
@@ -183,4 +180,4 @@ class PropertyList(val root: Object) {
             return result
         }
     }
-}
+}