Skip to content

Commit 3ce492f

Browse files
llv22llv22
committed
llv23 - for updates of ibdesignable
1 parent 694019f commit 3ce492f

File tree

9 files changed

+74
-27
lines changed

9 files changed

+74
-27
lines changed

‎tools/411_what's_New_in_interface_Builder/Sights.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@
340340
F13E2407198CCE1200CB6BD0 /* Project object */ = {
341341
isa = PBXProject;
342342
attributes = {
343-
LastUpgradeCheck = 0600;
343+
LastSwiftUpdateCheck = 0720;
344+
LastUpgradeCheck = 0720;
344345
ORGANIZATIONNAME = llv22;
345346
TargetAttributes = {
346347
F13E240E198CCE1200CB6BD0 = {
@@ -510,6 +511,7 @@
510511
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
511512
COPY_PHASE_STRIP = NO;
512513
ENABLE_STRICT_OBJC_MSGSEND = YES;
514+
ENABLE_TESTABILITY = YES;
513515
GCC_C_LANGUAGE_STANDARD = gnu99;
514516
GCC_DYNAMIC_NO_PIC = NO;
515517
GCC_OPTIMIZATION_LEVEL = 0;
@@ -578,6 +580,7 @@
578580
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
579581
INFOPLIST_FILE = Sights/Info.plist;
580582
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
583+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
581584
PRODUCT_NAME = "$(TARGET_NAME)";
582585
PROVISIONING_PROFILE = "";
583586
};
@@ -592,6 +595,7 @@
592595
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
593596
INFOPLIST_FILE = Sights/Info.plist;
594597
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
598+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
595599
PRODUCT_NAME = "$(TARGET_NAME)";
596600
PROVISIONING_PROFILE = "";
597601
};
@@ -611,6 +615,7 @@
611615
);
612616
INFOPLIST_FILE = SightsTests/Info.plist;
613617
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
618+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
614619
PRODUCT_NAME = "$(TARGET_NAME)";
615620
TEST_HOST = "$(BUNDLE_LOADER)";
616621
};
@@ -626,6 +631,7 @@
626631
);
627632
INFOPLIST_FILE = SightsTests/Info.plist;
628633
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
634+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
629635
PRODUCT_NAME = "$(TARGET_NAME)";
630636
TEST_HOST = "$(BUNDLE_LOADER)";
631637
};
@@ -649,6 +655,7 @@
649655
INFOPLIST_FILE = SiteRateKit/Info.plist;
650656
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
651657
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
658+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
652659
PRODUCT_NAME = "$(TARGET_NAME)";
653660
SKIP_INSTALL = YES;
654661
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -671,6 +678,7 @@
671678
INFOPLIST_FILE = SiteRateKit/Info.plist;
672679
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
673680
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
681+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
674682
PRODUCT_NAME = "$(TARGET_NAME)";
675683
SKIP_INSTALL = YES;
676684
VERSIONING_SYSTEM = "apple-generic";
@@ -691,6 +699,7 @@
691699
);
692700
INFOPLIST_FILE = SiteRateKitTests/Info.plist;
693701
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
702+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
694703
PRODUCT_NAME = "$(TARGET_NAME)";
695704
};
696705
name = Debug;
@@ -704,6 +713,7 @@
704713
);
705714
INFOPLIST_FILE = SiteRateKitTests/Info.plist;
706715
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
716+
PRODUCT_BUNDLE_IDENTIFIER = "com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}";
707717
PRODUCT_NAME = "$(TARGET_NAME)";
708718
};
709719
name = Release;

‎tools/411_what's_New_in_interface_Builder/Sights.xcodeproj/xcuserdata/llv23.xcuserdatad/xcschemes/Sights.xcscheme‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,17 +62,21 @@
6262
ReferencedContainer = "container:Sights.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
75-
<BuildableProductRunnable>
78+
<BuildableProductRunnable
79+
runnableDebuggingMode = "0">
7680
<BuildableReference
7781
BuildableIdentifier = "primary"
7882
BlueprintIdentifier = "F13E240E198CCE1200CB6BD0"
@@ -85,12 +89,13 @@
8589
</AdditionalOptions>
8690
</LaunchAction>
8791
<ProfileAction
92+
buildConfiguration = "Release"
8893
shouldUseLaunchSchemeArgsEnv = "YES"
8994
savedToolIdentifier = ""
9095
useCustomWorkingDirectory = "NO"
91-
buildConfiguration = "Release"
9296
debugDocumentVersioning = "YES">
93-
<BuildableProductRunnable>
97+
<BuildableProductRunnable
98+
runnableDebuggingMode = "0">
9499
<BuildableReference
95100
BuildableIdentifier = "primary"
96101
BlueprintIdentifier = "F13E240E198CCE1200CB6BD0"

‎tools/411_what's_New_in_interface_Builder/Sights.xcodeproj/xcuserdata/llv23.xcuserdatad/xcschemes/SiteRateKit.xcscheme‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "0720"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:Sights.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<MacroExpansion>
7679
<BuildableReference
@@ -85,10 +88,10 @@
8588
</AdditionalOptions>
8689
</LaunchAction>
8790
<ProfileAction
91+
buildConfiguration = "Release"
8892
shouldUseLaunchSchemeArgsEnv = "YES"
8993
savedToolIdentifier = ""
9094
useCustomWorkingDirectory = "NO"
91-
buildConfiguration = "Release"
9295
debugDocumentVersioning = "YES">
9396
<MacroExpansion>
9497
<BuildableReference

‎tools/411_what's_New_in_interface_Builder/Sights/AppDelegate.swift‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,37 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

16+
func application(application: UIApplication, willFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
17+
// Override point for customization after application launch.
18+
return true
19+
}
1620

21+
/*
1722
func application(application: UIApplication!, didFinishLaunchingWithOptions launchOptions: NSDictionary!) -> Bool {
1823
// Override point for customization after application launch.
1924
return true
2025
}
26+
*/
2127

22-
func applicationWillResignActive(application: UIApplication!) {
28+
func applicationWillResignActive(application: UIApplication) {
2329
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
2430
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
2531
}
2632

27-
func applicationDidEnterBackground(application: UIApplication!) {
33+
func applicationDidEnterBackground(application: UIApplication) {
2834
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
2935
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
3036
}
3137

32-
func applicationWillEnterForeground(application: UIApplication!) {
38+
func applicationWillEnterForeground(application: UIApplication) {
3339
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
3440
}
3541

36-
func applicationDidBecomeActive(application: UIApplication!) {
42+
func applicationDidBecomeActive(application: UIApplication) {
3743
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
3844
}
3945

40-
func applicationWillTerminate(application: UIApplication!) {
46+
func applicationWillTerminate(application: UIApplication) {
4147
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4248
}
4349

‎tools/411_what's_New_in_interface_Builder/Sights/Base.lproj/Main.storyboard‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6221" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Qb7-i0-9DN">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Qb7-i0-9DN">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6213"/>
4+
<deployment identifier="iOS"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
56
<capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
67
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
78
</dependencies>
@@ -16,17 +17,19 @@
1617
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
1718
<prototypes>
1819
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="SightCell" rowHeight="160" id="c3h-o6-aIm">
20+
<rect key="frame" x="0.0" y="86" width="600" height="160"/>
1921
<autoresizingMask key="autoresizingMask"/>
2022
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="c3h-o6-aIm" id="wzL-dl-yO7">
23+
<rect key="frame" x="0.0" y="0.0" width="600" height="159"/>
2124
<autoresizingMask key="autoresizingMask"/>
2225
<subviews>
23-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SubLabel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eXh-gQ-rF1">
26+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="SubLabel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eXh-gQ-rF1">
2427
<rect key="frame" x="199" y="88" width="73" height="21"/>
2528
<fontDescription key="fontDescription" type="system" pointSize="17"/>
2629
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
2730
<nil key="highlightedColor"/>
2831
</label>
29-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eyB-Xr-pD6">
32+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eyB-Xr-pD6">
3033
<rect key="frame" x="199" y="51" width="58" height="29"/>
3134
<fontDescription key="fontDescription" type="system" pointSize="24"/>
3235
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -74,7 +77,6 @@
7477
<!--View Controller-->
7578
<scene sceneID="Eto-n6-WPB">
7679
<objects>
77-
<placeholder placeholderIdentifier="IBFirstResponder" id="kWD-4i-q8r" userLabel="First Responder" sceneMemberID="firstResponder"/>
7880
<viewController id="lPW-q4-9JR" sceneMemberID="viewController">
7981
<layoutGuides>
8082
<viewControllerLayoutGuide type="top" id="L08-Mt-DAF"/>
@@ -92,6 +94,7 @@
9294
</view>
9395
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
9496
</viewController>
97+
<placeholder placeholderIdentifier="IBFirstResponder" id="kWD-4i-q8r" userLabel="First Responder" sceneMemberID="firstResponder"/>
9598
</objects>
9699
<point key="canvasLocation" x="-134" y="427"/>
97100
</scene>

‎tools/411_what's_New_in_interface_Builder/Sights/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,31 @@
55
"size" : "29x29",
66
"scale" : "2x"
77
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "29x29",
11+
"scale" : "3x"
12+
},
813
{
914
"idiom" : "iphone",
1015
"size" : "40x40",
1116
"scale" : "2x"
1217
},
18+
{
19+
"idiom" : "iphone",
20+
"size" : "40x40",
21+
"scale" : "3x"
22+
},
1323
{
1424
"idiom" : "iphone",
1525
"size" : "60x60",
1626
"scale" : "2x"
1727
},
28+
{
29+
"idiom" : "iphone",
30+
"size" : "60x60",
31+
"scale" : "3x"
32+
},
1833
{
1934
"idiom" : "ipad",
2035
"size" : "29x29",
@@ -44,6 +59,11 @@
4459
"idiom" : "ipad",
4560
"size" : "76x76",
4661
"scale" : "2x"
62+
},
63+
{
64+
"idiom" : "ipad",
65+
"size" : "83.5x83.5",
66+
"scale" : "2x"
4767
}
4868
],
4969
"info" : {

‎tools/411_what's_New_in_interface_Builder/SightsTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎tools/411_what's_New_in_interface_Builder/SiteRateKit/SiteTileView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ class SiteTileView: UIView {
116116
// desc - TARGET_INTERFACE_BUILDER doesn't exist as documentation described
117117
// #if TARGET_INTERFACE_BUILDER
118118
// #endif
119-
let projectPaths = (NSProcessInfo.processInfo().environment["IB_PROJECT_SOURCE_DIRECTORIES"] as String).componentsSeparatedByString(",")
119+
let projectPaths = (NSProcessInfo.processInfo().environment["IB_PROJECT_SOURCE_DIRECTORIES"]! as String).componentsSeparatedByString(",")
120120
if (projectPaths.count > 0) {
121121
if let projectPath = projectPaths[0] as String? {
122-
let imagePath = projectPath.stringByAppendingPathComponent("TestImages/London.jpg")
122+
let imagePath = projectPath.stringByAppendingString("TestImages/London.jpg")
123123
image = UIImage(contentsOfFile: imagePath)
124124
assert(image != nil, "image exists")
125125
}

‎tools/411_what's_New_in_interface_Builder/SiteRateKitTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.orlando.wwdc2014.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)