tweaks to chapter 9 examples; converted one project to the new Info.plist format (interesting exercise)

mattneub · mattneub · commit 793c077098c7 · 2021-09-11T09:59:02.000-07:00
diff --git a/bk1ch09p380unitTesting/EmptyWindowTests/EmptyWindowTests.swift b/bk1ch09p380unitTesting/EmptyWindowTests/EmptyWindowTests.swift
@@ -74,6 +74,7 @@ class EmptyWindowTests: XCTestCase {
     }
     
     func testCustomAssertion() {
+        return; // comment out to try it
         let loc = XCTSourceCodeLocation(filePath: #file, lineNumber: #line) // point of failure
         var issue = XCTIssue(type: .assertionFailure, compactDescription: "oh darn")
         issue.add(XCTAttachment(string:"yipes"))
diff --git a/bk1ch09p380unitTesting/TestPlan2.xctestplan b/bk1ch09p380unitTesting/TestPlan2.xctestplan
@@ -13,14 +13,14 @@
   },
   "testTargets" : [
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:bk1ch09p380unitTesting.xcodeproj",
         "identifier" : "814A1AAF1D109C1F008F3FF6",
         "name" : "EmptyWindowTests"
       }
     },
     {
+      "enabled" : false,
       "target" : {
         "containerPath" : "container:bk1ch09p380unitTesting.xcodeproj",
         "identifier" : "814A1AA11D109B13008F3FF6",
diff --git a/bk1ch09p380unitTesting/bk1ch09p380unitTesting/Base.lproj/Main.storyboard b/bk1ch09p380unitTesting/bk1ch09p380unitTesting/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19158" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19141"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,7 +16,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KSR-PR-fGd">
-                                <rect key="frame" x="44" y="45" width="61" height="30"/>
+                                <rect key="frame" x="52" y="162" width="61" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <accessibility key="accessibilityConfiguration" identifier="GreetingButton"/>
                                 <state key="normal" title="Hello"/>
diff --git a/bk1ch09p397localization/Empty Window.xcodeproj/project.pbxproj b/bk1ch09p397localization/Empty Window.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 55;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -109,7 +109,7 @@
 				};
 			};
 			buildConfigurationList = 818047471F2E5DF20096D446 /* Build configuration list for PBXProject "Empty Window" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 13.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -241,7 +241,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -293,7 +293,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -306,15 +306,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W3LHX5RGV2;
+				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Empty Window/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "Empty Window";
+				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
+				INFOPLIST_KEY_UIMainStoryboardFile = Main;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.neuburg.matt.Empty-Window";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -324,15 +334,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W3LHX5RGV2;
+				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Empty Window/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = "Empty Window";
+				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
+				INFOPLIST_KEY_UIMainStoryboardFile = Main;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.neuburg.matt.Empty-Window";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
diff --git a/bk1ch09p397localization/Empty Window.xcodeproj/xcshareddata/xcschemes/Empty Window.xcscheme b/bk1ch09p397localization/Empty Window.xcodeproj/xcshareddata/xcschemes/Empty Window.xcscheme
@@ -34,6 +34,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = "fr"
+      region = "FR"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/bk1ch09p397localization/Empty Window/Base.lproj/Main.storyboard b/bk1ch09p397localization/Empty Window/Base.lproj/Main.storyboard
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14835.7" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19158" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14790.5"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19141"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,21 +15,21 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YMD-h7-RKH">
-                                <rect key="frame" x="36" y="32" width="95" height="30"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="LocalizableImage" translatesAutoresizingMaskIntoConstraints="NO" id="tWA-Vk-4PR">
+                                <rect key="frame" x="33" y="181" width="180" height="180"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YMD-h7-RKH">
+                                <rect key="frame" x="33" y="84" width="95" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Hello"/>
                                 <connections>
                                     <action selector="buttonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="r42-fS-mRa"/>
                                 </connections>
                             </button>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="LocalizableImage" translatesAutoresizingMaskIntoConstraints="NO" id="tWA-Vk-4PR">
-                                <rect key="frame" x="33" y="110" width="180" height="180"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
diff --git a/bk1ch09p397localization/Empty Window/Info.plist b/bk1ch09p397localization/Empty Window/Info.plist
@@ -1,47 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Empty Window</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
+<dict/>
 </plist>
diff --git a/bk1ch09p397localization/Empty Window/ViewController.swift b/bk1ch09p397localization/Empty Window/ViewController.swift
@@ -6,15 +6,21 @@ class ViewController: UIViewController {
 
     
     @IBAction func buttonPressed(_ sender: Any) {
+        let greeting = String(
+            localized: "Howdy!",
+            comment: "Alert title: Say hello")
+        let message = String(
+            localized: "You tapped me!",
+            comment: "Alert message: Report a tap")
+        let ok = String(
+            localized: "OK",
+            comment: "Alert button: accept and dismiss")
         let alert = UIAlertController(
-            title: NSLocalizedString(
-                "Greeting", value:"Howdy!", comment:"Say hello"),
-            message: NSLocalizedString(
-                "Tapped", value:"You tapped me!", comment:"User tapped button"),
+            title: greeting,
+            message: message,
             preferredStyle: .alert)
         alert.addAction(
-            UIAlertAction(title: NSLocalizedString(
-                "Accept", value:"OK", comment:"Dismiss"),
+            UIAlertAction(title: ok,
                           style: .cancel))
         self.present(alert, animated: true)
     }
diff --git a/bk1ch09p397localization/Empty Window/fr.lproj/Localizable.strings b/bk1ch09p397localization/Empty Window/fr.lproj/Localizable.strings
@@ -1,9 +1,9 @@
-/* Dismiss */
-"Accept" = "OK";
+/* Alert title: Say hello */
+"Howdy!" = "Bonjour!";
 
-/* Say hello */
-"Greeting" = "Bonjour!";
+/* Alert button: accept and dismiss */
+"OK" = "OK";
 
-/* User tapped button */
-"Tapped" = "Vous m'avez tapé!";
+/* Alert message: Report a tap */
+"You tapped me!" = "Vous m'avez tapé!";
 

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ class EmptyWindowTests: XCTestCase {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`func testCustomAssertion() {`
	`77`	`+ return; // comment out to try it`
`77`	`78`	`let loc = XCTSourceCodeLocation(filePath: #file, lineNumber: #line) // point of failure`
`78`	`79`	`var issue = XCTIssue(type: .assertionFailure, compactDescription: "oh darn")`
`79`	`80`	`issue.add(XCTAttachment(string:"yipes"))`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,14 @@`
`13`	`13`	`},`
`14`	`14`	`"testTargets" : [`
`15`	`15`	`{`
`16`		`- "enabled" : false,`
`17`	`16`	`"target" : {`
`18`	`17`	`"containerPath" : "container:bk1ch09p380unitTesting.xcodeproj",`
`19`	`18`	`"identifier" : "814A1AAF1D109C1F008F3FF6",`
`20`	`19`	`"name" : "EmptyWindowTests"`
`21`	`20`	`}`
`22`	`21`	`},`
`23`	`22`	`{`
	`23`	`+ "enabled" : false,`
`24`	`24`	`"target" : {`
`25`	`25`	`"containerPath" : "container:bk1ch09p380unitTesting.xcodeproj",`
`26`	`26`	`"identifier" : "814A1AA11D109B13008F3FF6",`