fix: Switch to personal developer account (#733)

inseven · Feb 14, 2024 · e7c8690 · e7c8690
1 parent bcaf05f
commit e7c8690
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 73 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -28,14 +28,14 @@ jobs:
 
     - name: Build, test, and release
       env:
-        APPLE_DISTRIBUTION_CERTIFICATE_BASE64: ${{ secrets.APPLE_DISTRIBUTION_CERTIFICATE_BASE64 }}
-        APPLE_DISTRIBUTION_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DISTRIBUTION_CERTIFICATE_PASSWORD }}
-        MACOS_DEVELOPER_INSTALLER_CERTIFICATE_BASE64: ${{ secrets.MACOS_DEVELOPER_INSTALLER_CERTIFICATE_BASE64 }}
-        MACOS_DEVELOPER_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_DEVELOPER_INSTALLER_CERTIFICATE_PASSWORD }}
-
-        APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
-        APPLE_API_KEY_ISSUER_ID: ${{ secrets.APPLE_API_KEY_ISSUER_ID }}
-        APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+        APPLE_DISTRIBUTION_CERTIFICATE_BASE64: ${{ secrets.PERSONAL_APPLE_DISTRIBUTION_CERTIFICATE_BASE64 }}
+        APPLE_DISTRIBUTION_CERTIFICATE_PASSWORD: ${{ secrets.PERSONAL_APPLE_DISTRIBUTION_CERTIFICATE_PASSWORD }}
+        MACOS_DEVELOPER_INSTALLER_CERTIFICATE_BASE64: ${{ secrets.PERSONAL_MACOS_DEVELOPER_INSTALLER_CERTIFICATE_BASE64 }}
+        MACOS_DEVELOPER_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.PERSONAL_MACOS_DEVELOPER_INSTALLER_CERTIFICATE_PASSWORD }}
+
+        APPLE_API_KEY_BASE64: ${{ secrets.PERSONAL_APPLE_API_KEY_BASE64 }}
+        APPLE_API_KEY_ISSUER_ID: ${{ secrets.PERSONAL_APPLE_API_KEY_ISSUER_ID }}
+        APPLE_API_KEY_ID: ${{ secrets.PERSONAL_APPLE_API_KEY_ID }}
 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         RELEASE: ${{ github.ref == 'refs/heads/main' }}

diff --git a/core/Sources/BookmarksCore/Common/Settings.swift b/core/Sources/BookmarksCore/Common/Settings.swift
@@ -33,7 +33,7 @@ final public class Settings: ObservableObject {
         let isEnabled: Bool
     }
 
-    let defaults = KeyedDefaults<SettingsKey>(defaults: UserDefaults(suiteName: "group.uk.co.inseven.bookmarks")!)
+    let defaults = KeyedDefaults<SettingsKey>(defaults: UserDefaults(suiteName: "group.uk.co.jbmorley.bookmarks")!)
 
     @Published public var pinboardApiKey: String? {
         didSet {

diff --git a/core/Sources/BookmarksCore/Store/Database.swift b/core/Sources/BookmarksCore/Store/Database.swift
@@ -99,7 +99,7 @@ public class Database {
     // possible to use the incorrect location in production but, absent a better solution, this will have to do.
     public static let sharedStoreURL: URL = {
         let fileManager = FileManager.default
-        let identifier = "group.uk.co.inseven.bookmarks"
+        let identifier = "group.uk.co.jbmorley.bookmarks"
         let groupURL = fileManager.containerURL(forSecurityApplicationGroupIdentifier: identifier)
         let documentsURL = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
         let directoryURL = groupURL ?? documentsURL

diff --git a/ios/Bookmarks Share Extension/Bookmarks Share Extension.entitlements b/ios/Bookmarks Share Extension/Bookmarks Share Extension.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.uk.co.inseven.bookmarks</string>
+		<string>group.uk.co.jbmorley.bookmarks</string>
 	</array>
 </dict>
 </plist>
diff --git a/ios/Bookmarks-iOS.xcodeproj/project.pbxproj b/ios/Bookmarks-iOS.xcodeproj/project.pbxproj
@@ -498,7 +498,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Bookmarks Share Extension/Bookmarks Share Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = $BUILD_NUMBER;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Bookmarks Share Extension/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "Bookmarks Share Extension";
@@ -510,7 +510,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 0.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.bookmarks.new.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.jbmorley.bookmarks.apps.appstore.share-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -528,7 +528,7 @@
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = $BUILD_NUMBER;
 				DEVELOPMENT_TEAM = "";
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = S4WXAUZQEV;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QS82QFHKWB;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Bookmarks Share Extension/Info.plist";
 				INFOPLIST_KEY_CFBundleDisplayName = "Bookmarks Share Extension";
@@ -540,7 +540,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 0.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.bookmarks.new.ShareExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.jbmorley.bookmarks.apps.appstore.share-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Bookmarks Share Extension App Store Profile";
@@ -685,14 +685,14 @@
 				CODE_SIGN_ENTITLEMENTS = Bookmarks/Bookmarks.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = $BUILD_NUMBER;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
 				INFOPLIST_FILE = Bookmarks/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.bookmarks.new;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.co.jbmorley.bookmarks.apps.appstore;
 				PRODUCT_NAME = Bookmarks;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Bookmarks/Bookmarks-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -709,15 +709,15 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = $BUILD_NUMBER;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
-				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = QS82QFHKWB;
 				INFOPLIST_FILE = Bookmarks/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.bookmarks.new;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.co.jbmorley.bookmarks.apps.appstore;
 				PRODUCT_NAME = Bookmarks;
 				PROVISIONING_PROFILE_SPECIFIER = "Bookmarks App Store Profile";
 				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Bookmarks App Store Profile";
@@ -734,14 +734,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
 				INFOPLIST_FILE = BookmarksTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.BookmarksTests;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.co.jbmorley.bookmarks.apps.appstore.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -756,14 +756,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
 				INFOPLIST_FILE = BookmarksTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.BookmarksTests;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.co.jbmorley.bookmarks.apps.appstore.tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -776,15 +776,15 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
 				INFOPLIST_FILE = BookmarksUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.BookmarksUITests;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.co.jbmorley.bookmarks.apps.uitests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -797,15 +797,15 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = S4WXAUZQEV;
+				DEVELOPMENT_TEAM = 9GNGYP6YR7;
 				INFOPLIST_FILE = BookmarksUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = uk.co.inseven.BookmarksUITests;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.co.jbmorley.bookmarks.apps.uitests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/ios/Bookmarks/Bookmarks.entitlements b/ios/Bookmarks/Bookmarks.entitlements
@@ -6,7 +6,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.uk.co.inseven.bookmarks</string>
+		<string>group.uk.co.jbmorley.bookmarks</string>
 	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>

diff --git a/ios/ExportOptions.plist b/ios/ExportOptions.plist
@@ -10,19 +10,19 @@
 	<string>app-store</string>
 	<key>provisioningProfiles</key>
 	<dict>
-		<key>uk.co.inseven.bookmarks.new</key>
+		<key>uk.co.jbmorley.bookmarks.apps.appstore</key>
 		<string>Bookmarks App Store Profile</string>
-		<key>uk.co.inseven.bookmarks.new.ShareExtension</key>
+		<key>uk.co.jbmorley.bookmarks.apps.appstore.share-extension</key>
 		<string>Bookmarks Share Extension App Store Profile</string>
 	</dict>
 	<key>signingCertificate</key>
-	<string>2AEA1234843D262A1F540E2F27DCC258932B0F57</string>
+	<string>91DADFE184A1526FA94D4513D5B4C75E1DB3B252</string>
 	<key>signingStyle</key>
 	<string>manual</string>
 	<key>stripSwiftSymbols</key>
 	<true/>
 	<key>teamID</key>
-	<string>S4WXAUZQEV</string>
+	<string>QS82QFHKWB</string>
 	<key>uploadSymbols</key>
 	<true/>
 </dict>