From 011f8e8db267d59866fc66c5deea95e288f745b6 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 18 Sep 2019 22:08:34 -0700 Subject: [PATCH] Add entitlements and make various changes in order to get it to build. --- NetNewsWire.xcodeproj/project.pbxproj | 18 +++++++++++++++--- iOS/Resources/NetNewsWire.entitlements | 10 ++++++++++ xcconfig/NetNewsWire_iOSapp_target.xcconfig | 2 +- ...tNewsWire_iOSshareextension_target.xcconfig | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 iOS/Resources/NetNewsWire.entitlements diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 19c9cdfb0..f6e7ef887 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -987,6 +987,7 @@ 84B7178B201E66580091657D /* SidebarViewController+ContextualMenus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SidebarViewController+ContextualMenus.swift"; sourceTree = ""; }; 84B99C9C1FAE83C600ECDEDB /* DeleteCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteCommand.swift; sourceTree = ""; }; 84BAE64821CEDAF20046DB56 /* CrashReporterWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CrashReporterWindow.xib; sourceTree = ""; }; + 84BB0F812333426400DED65E /* NetNewsWire.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NetNewsWire.entitlements; sourceTree = ""; }; 84BBB12B20142A4700F054F5 /* Inspector.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Inspector.storyboard; sourceTree = ""; }; 84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InspectorWindowController.swift; sourceTree = ""; }; 84C37F7A20DD8CF200CA8CF5 /* RSCore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSCore.xcodeproj; path = submodules/RSCore/RSCore.xcodeproj; sourceTree = ""; }; @@ -1964,6 +1965,7 @@ 51C452B72265178500C03939 /* styleSheet.css */, 84C9FC9B2262A1A900D921D6 /* Assets.xcassets */, 84C9FC9C2262A1A900D921D6 /* Info.plist */, + 84BB0F812333426400DED65E /* NetNewsWire.entitlements */, ); path = Resources; sourceTree = ""; @@ -2224,7 +2226,7 @@ TargetAttributes = { 513C5CE5232571C2003D4054 = { CreatedOnToolsVersion = 11.0; - DevelopmentTeam = DY2XQRVWN9; + DevelopmentTeam = M8L2WTLA8W; ProvisioningStyle = Automatic; }; 6581C73220CED60000F4AD34 = { @@ -2233,7 +2235,7 @@ }; 840D617B2029031C009BC708 = { CreatedOnToolsVersion = 9.3; - DevelopmentTeam = DY2XQRVWN9; + DevelopmentTeam = M8L2WTLA8W; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.BackgroundModes = { @@ -2569,7 +2571,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11 buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; + shellScript = "##xcrun -sdk macosx swiftc -target x86_64-macosx10.11 buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n##$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n"; }; 51D6803823330CFF0097A009 /* Update Feedbin Mercury API Keys */ = { isa = PBXShellScriptBuildPhase; @@ -3149,6 +3151,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = M8L2WTLA8W; PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire.iOS.Share-Extension"; }; name = Debug; @@ -3157,6 +3161,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = M8L2WTLA8W; PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire.iOS.Share-Extension"; }; name = Release; @@ -3179,6 +3185,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */; buildSettings = { + CODE_SIGN_ENTITLEMENTS = iOS/Resources/NetNewsWire.entitlements; + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = M8L2WTLA8W; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS; }; name = Debug; @@ -3187,6 +3196,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */; buildSettings = { + CODE_SIGN_ENTITLEMENTS = iOS/Resources/NetNewsWire.entitlements; + CODE_SIGN_IDENTITY = "iPhone Developer"; + DEVELOPMENT_TEAM = M8L2WTLA8W; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS; }; name = Release; diff --git a/iOS/Resources/NetNewsWire.entitlements b/iOS/Resources/NetNewsWire.entitlements new file mode 100644 index 000000000..acce3514f --- /dev/null +++ b/iOS/Resources/NetNewsWire.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.application-groups + + group.com.ranchero.NetNewsWire.iOS + + + diff --git a/xcconfig/NetNewsWire_iOSapp_target.xcconfig b/xcconfig/NetNewsWire_iOSapp_target.xcconfig index 534d890ed..acfbf86f6 100644 --- a/xcconfig/NetNewsWire_iOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_iOSapp_target.xcconfig @@ -41,7 +41,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; IPHONEOS_DEPLOYMENT_TARGET = 13.0 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks INFOPLIST_FILE = iOS/Resources/Info.plist -PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen.iOS +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS PRODUCT_NAME = NetNewsWire SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 1,2 diff --git a/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig b/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig index e22d2bd63..b791827aa 100644 --- a/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig +++ b/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig @@ -3,5 +3,5 @@ CODE_SIGN_ENTITLEMENTS = iOS/ShareExtension/NetNewsWire_iOS_ShareExtension.entitlements INFOPLIST_FILE = iOS/ShareExtension/Info.plist -PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen.iOS.Share-Extension +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS.Share-Extension PRODUCT_NAME = $(TARGET_NAME)