Improve color detection. Migrate project to Xcode 14.2.

objecthub · Jan 30, 2023 · c66994d · c66994d
1 parent 6b1af62
commit c66994d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.3.5 (2023-01-29)
+- Be more clever about detecting color terminals
+- Migrate project to Xcode 14.2
+
 ## 0.3.4 (2021-05-12)
 - Minor bug fixes
 - Migrated project to Xcode 12.5

diff --git a/CommandLineKit.xcodeproj/project.pbxproj b/CommandLineKit.xcodeproj/project.pbxproj
@@ -276,7 +276,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1420;
 				ORGANIZATIONNAME = "Matthias Zenger";
 				TargetAttributes = {
 					CC7A60E6207A62A5007376A0 = {
@@ -418,6 +418,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -473,6 +474,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -498,6 +500,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/CommandLineKitDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -518,6 +521,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/CommandLineKitDemo/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -556,6 +560,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -570,6 +575,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.CommandLineKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -605,6 +611,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -619,6 +626,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.CommandLineKit;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -652,6 +660,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Tests/CommandLineKitTests/Info.plist;
@@ -691,6 +700,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = C72Z63N8M5;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Tests/CommandLineKitTests/Info.plist;

diff --git a/CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKit.xcscheme b/CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKitDemo.xcscheme b/CommandLineKit.xcodeproj/xcshareddata/xcschemes/CommandLineKitDemo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Package.swift b/Package.swift
@@ -43,7 +43,7 @@ import PackageDescription
 let package = Package(
   name: "CommandLineKit",
   platforms: [
-    .macOS(.v10_12)
+    .macOS(.v10_13)
   ],
   products: [
     .library(name: "CommandLineKit", targets: ["CommandLineKit"]),

diff --git a/Sources/CommandLineKit/Terminal.swift b/Sources/CommandLineKit/Terminal.swift
@@ -41,6 +41,15 @@ public struct Terminal {
   public static let current: String = ProcessInfo.processInfo.environment["TERM"] ?? ""
 
   public static var fullColorSupport: Bool {
+    // First make sure we are not running within Xcode
+    guard ProcessInfo.processInfo.environment["__XCODE_BUILT_PRODUCTS_DIR_PATHS"] == nil else {
+      return false
+    }
+    // Next, check if there is an environment variable COLORTERM set to "truecolor"
+    if let cterm = ProcessInfo.processInfo.environment["COLORTERM"], cterm == "truecolor" {
+      return true
+    }
+    // Finally, apply some heuristics based on the current terminal
     return Terminal.fullColorSupport(terminal: Terminal.current)
   }
 

diff --git a/Sources/CommandLineKitDemo/Info.plist b/Sources/CommandLineKitDemo/Info.plist
@@ -23,6 +23,6 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 Google LLC</string>
+	<string>Copyright © 2018-2023 Google LLC</string>
 </dict>
 </plist>