Skip to content

Fix crash for Xcode 15.3 #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2024
Merged

Fix crash for Xcode 15.3 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/macosMain/kotlin/co/touchlab/xcode/cli/PluginManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object PluginManager {

Console.echo("Synchronizing plugin compatibility list.")
val additionalPluginCompatibilityIds =
xcodeInstallations.map { PropertyList.Object.String(it.pluginCompatabilityId) }
xcodeInstallations.mapNotNull { it.pluginCompatabilityId?.let { PropertyList.Object.String(it) } }
logger.v { "Xcode installation IDs to include: ${additionalPluginCompatibilityIds.joinToString { it.value }}" }
val infoPlist = PropertyList.create(pluginTargetInfoFile)
val rootDictionary = infoPlist.root.dictionary
Expand Down
12 changes: 11 additions & 1 deletion src/macosMain/kotlin/co/touchlab/xcode/cli/XcodeHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import co.touchlab.xcode.cli.XcodeHelper.Defaults.nonApplePlugins
import co.touchlab.xcode.cli.util.BackupHelper
import co.touchlab.xcode.cli.util.Console
import co.touchlab.xcode.cli.util.File
import co.touchlab.xcode.cli.util.fromString
import co.touchlab.xcode.cli.util.Path
import co.touchlab.xcode.cli.util.PropertyList
import co.touchlab.xcode.cli.util.Shell
import co.touchlab.xcode.cli.util.Version
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
Expand Down Expand Up @@ -83,6 +85,14 @@ object XcodeHelper {
checkNotNull(versionPlist.build?.trim()) { "Couldn't get build number of Xcode at $path." }
}

if (Version.fromString(version) >= Version.fromString("15.3")) {
return XcodeInstallation(
version = version,
build = build,
path = path
)
}

val xcodeInfoPath = path / "Contents" / "Info"
val pluginCompatabilityIdResult = Shell.exec("/usr/bin/defaults", "read", xcodeInfoPath.value, "DVTPlugInCompatibilityUUID")
.checkSuccessful {
Expand Down Expand Up @@ -154,7 +164,7 @@ object XcodeHelper {
val version: String,
val build: String,
val path: Path,
val pluginCompatabilityId: String,
val pluginCompatabilityId: String? = null,
) {
val name: String = "Xcode $version ($build)"
}
Expand Down