From c0e27b219549d415ec37da8f554728d8ef0e34a1 Mon Sep 17 00:00:00 2001 From: NicoleYarroch Date: Wed, 18 Jul 2018 14:38:17 -0400 Subject: Switches between targets without crashing Fixed module name for Swift files Removed module names for Objective-C files Signed-off-by: NicoleYarroch --- SmartDeviceLink-iOS.xcodeproj/project.pbxproj | 10 +++++----- .../ConnectionIAPTableViewController.storyboard | 4 ++-- .../ConnectionTCPTableViewController.storyboard | 4 ++-- SmartDeviceLink_Example/Main.storyboard | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index e2a753c99..8a3808eeb 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -2486,7 +2486,7 @@ 8814AEA920AB663800466E0F /* PerformInteractionManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PerformInteractionManager.m; sourceTree = ""; }; 8814AEAB20AB667B00466E0F /* PerformInteractionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerformInteractionManager.swift; sourceTree = ""; }; 88166AFF207E41E900076236 /* MenuManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuManager.swift; sourceTree = ""; }; - 88295697207CF68800EF056C /* SDL Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SDL Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 88295697207CF68800EF056C /* SDL Example Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SDL Example Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 88295698207CF68800EF056C /* SmartDeviceLink-Example-Swift-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "SmartDeviceLink-Example-Swift-Info.plist"; path = "/Users/nicolelivioradio.com/sdl_ios/SmartDeviceLink-Example-Swift-Info.plist"; sourceTree = ""; }; 8829569C207CFD0D00EF056C /* SmartDeviceLink-Example-Swift-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SmartDeviceLink-Example-Swift-Bridging-Header.h"; sourceTree = ""; }; 8829569D207CFD0E00EF056C /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -3308,7 +3308,7 @@ 5D4019AF1A76EC350006B0C2 /* SDL Example.app */, 5D61FA1C1A84237100846EE7 /* SmartDeviceLink.framework */, 5D61FA261A84237100846EE7 /* SmartDeviceLinkTests.xctest */, - 88295697207CF68800EF056C /* SDL Example.app */, + 88295697207CF68800EF056C /* SDL Example Swift.app */, 88802FEF20853AE600E9EBC6 /* SmartDeviceLinkSwift.framework */, ); name = Products; @@ -5768,7 +5768,7 @@ ); name = "SmartDeviceLink-Example-Swift"; productName = "SmartDeviceLink-iOS"; - productReference = 88295697207CF68800EF056C /* SDL Example.app */; + productReference = 88295697207CF68800EF056C /* SDL Example Swift.app */; productType = "com.apple.product-type.application"; }; 88802CD720853AE600E9EBC6 /* SmartDeviceLinkSwift */ = { @@ -7125,7 +7125,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SDLTestApp; - PRODUCT_NAME = "SDL Example"; + PRODUCT_NAME = "SDL Example Swift"; SWIFT_OBJC_BRIDGING_HEADER = "SmartDeviceLink_Example/SmartDeviceLink-Example-Swift-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; @@ -7144,7 +7144,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.smartdevicelink.SDLTestApp; - PRODUCT_NAME = "SDL Example"; + PRODUCT_NAME = "SDL Example Swift"; SWIFT_OBJC_BRIDGING_HEADER = "SmartDeviceLink_Example/SmartDeviceLink-Example-Swift-Bridging-Header.h"; SWIFT_VERSION = 3.0; }; diff --git a/SmartDeviceLink_Example/ConnectionIAPTableViewController.storyboard b/SmartDeviceLink_Example/ConnectionIAPTableViewController.storyboard index ef04daa8e..44ec1e58b 100644 --- a/SmartDeviceLink_Example/ConnectionIAPTableViewController.storyboard +++ b/SmartDeviceLink_Example/ConnectionIAPTableViewController.storyboard @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard b/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard index fc112572c..ff8be7363 100644 --- a/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard +++ b/SmartDeviceLink_Example/ConnectionTCPTableViewController.storyboard @@ -1,5 +1,5 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/SmartDeviceLink_Example/Main.storyboard b/SmartDeviceLink_Example/Main.storyboard index 81cd0bdcf..7415d792f 100644 --- a/SmartDeviceLink_Example/Main.storyboard +++ b/SmartDeviceLink_Example/Main.storyboard @@ -1,5 +1,5 @@ - + @@ -30,7 +30,7 @@ - + -- cgit v1.2.1