From 391955d8790ee987afb54f1fb0a699a405c20e1b Mon Sep 17 00:00:00 2001 From: Michael Neale Date: Thu, 10 Jul 2025 09:37:29 +1000 Subject: [PATCH] working on macos --- bitchat.xcodeproj/project.pbxproj | 90 +++++++++++++++---------------- bitchat/Info.plist | 20 ------- project.yml | 40 +++++++------- 3 files changed, 65 insertions(+), 85 deletions(-) diff --git a/bitchat.xcodeproj/project.pbxproj b/bitchat.xcodeproj/project.pbxproj index 9ee9abe3..ce5111bb 100644 --- a/bitchat.xcodeproj/project.pbxproj +++ b/bitchat.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 2E71E320EA921498C57E023B /* BitchatMessageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FA8FF26ABDC1C642A8C7AE5 /* BitchatMessageTests.swift */; }; 31D147471B9F4E2815352DDA /* LinkPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AC141774F6671FCDC347DC7 /* LinkPreviewView.swift */; }; 4274B6016F755946FBF2513E /* MessageRetentionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A85BFDDE65B4CD8BDF6DDB /* MessageRetentionService.swift */; }; - 46E1E1013CC18AB66105DB27 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 95F16C3A4A5621C74461D8D3 /* LaunchScreen.storyboard */; }; 4B747085D07A1BCE0F5BA612 /* BinaryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2136C3E22D02D4A8DBE7EAB /* BinaryProtocol.swift */; }; 4E778E5A414571ACAC2A0F01 /* MessageRetentionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A85BFDDE65B4CD8BDF6DDB /* MessageRetentionService.swift */; }; 5D95F2BFBE257A1225998389 /* BatteryOptimizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED176FF3B274E35C2D827894 /* BatteryOptimizer.swift */; }; @@ -353,24 +352,24 @@ LastUpgradeCheck = 1430; TargetAttributes = { 0576A29205865664C0937536 = { - DevelopmentTeam = L3N5LHJD5Y; - ProvisioningStyle = Automatic; + DevelopmentTeam = W2L75AE9HQ; + ProvisioningStyle = Manual; }; 47FF23248747DD7CB666CB91 = { - DevelopmentTeam = L3N5LHJD5Y; - ProvisioningStyle = Automatic; + DevelopmentTeam = W2L75AE9HQ; + ProvisioningStyle = Manual; }; 57CA17A36A2532A6CFF367BB = { - DevelopmentTeam = L3N5LHJD5Y; - ProvisioningStyle = Automatic; + DevelopmentTeam = W2L75AE9HQ; + ProvisioningStyle = Manual; }; 6CB97DF2EA57234CB3E563B8 = { - DevelopmentTeam = L3N5LHJD5Y; - ProvisioningStyle = Automatic; + DevelopmentTeam = W2L75AE9HQ; + ProvisioningStyle = Manual; }; AF077EA0474EDEDE2C72716C = { - DevelopmentTeam = L3N5LHJD5Y; - ProvisioningStyle = Automatic; + DevelopmentTeam = W2L75AE9HQ; + ProvisioningStyle = Manual; }; }; }; @@ -403,7 +402,6 @@ buildActionMask = 2147483647; files = ( 7DD72D928FF9DD3CA81B46B0 /* Assets.xcassets in Resources */, - 46E1E1013CC18AB66105DB27 /* LaunchScreen.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -526,8 +524,8 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGNING_ALLOWED = YES; CODE_SIGNING_REQUIRED = YES; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = W2L75AE9HQ; INFOPLIST_FILE = bitchatTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -535,7 +533,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat.tests; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -549,8 +547,8 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGNING_ALLOWED = YES; CODE_SIGNING_REQUIRED = YES; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = W2L75AE9HQ; INFOPLIST_FILE = bitchatTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -558,7 +556,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat.tests; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -572,9 +570,9 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGNING_ALLOWED = YES; CODE_SIGNING_REQUIRED = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + DEVELOPMENT_TEAM = W2L75AE9HQ; INFOPLIST_FILE = bitchatTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -582,7 +580,7 @@ "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat.tests; SDKROOT = macosx; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bitchat.app/Contents/MacOS/bitchat"; @@ -596,8 +594,8 @@ CODE_SIGNING_REQUIRED = YES; CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION = YES; CODE_SIGN_ENTITLEMENTS = bitchatShareExtension/bitchatShareExtension.entitlements; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = W2L75AE9HQ; INFOPLIST_FILE = bitchatShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -605,7 +603,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.ShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat.ShareExtension; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -621,8 +619,8 @@ CODE_SIGNING_REQUIRED = YES; CODE_SIGN_ENTITLEMENTS = bitchat/bitchat.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = W2L75AE9HQ; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = bitchat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; @@ -630,7 +628,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat; PRODUCT_NAME = bitchat; SDKROOT = iphoneos; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; @@ -645,9 +643,9 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGNING_ALLOWED = YES; CODE_SIGNING_REQUIRED = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + DEVELOPMENT_TEAM = W2L75AE9HQ; INFOPLIST_FILE = bitchatTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -655,7 +653,7 @@ "@loader_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat.tests; SDKROOT = macosx; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bitchat.app/Contents/MacOS/bitchat"; @@ -671,8 +669,8 @@ CODE_SIGNING_REQUIRED = YES; CODE_SIGN_ENTITLEMENTS = bitchat/bitchat.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = W2L75AE9HQ; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = bitchat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; @@ -680,7 +678,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat; PRODUCT_NAME = bitchat; SDKROOT = iphoneos; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; @@ -694,12 +692,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; - CODE_SIGNING_ALLOWED = YES; - CODE_SIGNING_REQUIRED = YES; + CODE_SIGNING_ALLOWED = NO; + CODE_SIGNING_REQUIRED = NO; CODE_SIGN_ENTITLEMENTS = bitchat/bitchat.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + DEVELOPMENT_TEAM = W2L75AE9HQ; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = bitchat/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -707,7 +705,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat; PRODUCT_NAME = bitchat; SDKROOT = macosx; SWIFT_VERSION = 5.0; @@ -777,12 +775,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; - CODE_SIGNING_ALLOWED = YES; - CODE_SIGNING_REQUIRED = YES; + CODE_SIGNING_ALLOWED = NO; + CODE_SIGNING_REQUIRED = NO; CODE_SIGN_ENTITLEMENTS = bitchat/bitchat.entitlements; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + DEVELOPMENT_TEAM = W2L75AE9HQ; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = bitchat/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -790,7 +788,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 13.0; - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat; PRODUCT_NAME = bitchat; SDKROOT = macosx; SWIFT_VERSION = 5.0; @@ -869,8 +867,8 @@ CODE_SIGNING_REQUIRED = YES; CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION = YES; CODE_SIGN_ENTITLEMENTS = bitchatShareExtension/bitchatShareExtension.entitlements; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = L3N5LHJD5Y; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = W2L75AE9HQ; INFOPLIST_FILE = bitchatShareExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -878,7 +876,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.ShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = com.local.bitchat.ShareExtension; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/bitchat/Info.plist b/bitchat/Info.plist index 567f2c3c..17cdfb12 100644 --- a/bitchat/Info.plist +++ b/bitchat/Info.plist @@ -35,25 +35,5 @@ bitchat uses Bluetooth to create a secure mesh network for chatting with nearby users. NSBluetoothPeripheralUsageDescription bitchat uses Bluetooth to discover and connect with other bitchat users nearby. - UIBackgroundModes - - bluetooth-central - bluetooth-peripheral - - UILaunchStoryboardName - LaunchScreen - UIRequiresFullScreen - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - diff --git a/project.yml b/project.yml index ea3c24a1..10c288a7 100644 --- a/project.yml +++ b/project.yml @@ -1,6 +1,6 @@ name: bitchat options: - bundleIdPrefix: chat.bitchat + bundleIdPrefix: com.local.bitchat deploymentTarget: iOS: 16.0 macOS: 13.0 @@ -43,17 +43,17 @@ targets: - CFBundleURLSchemes: - bitchat settings: - PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat + PRODUCT_BUNDLE_IDENTIFIER: com.local.bitchat PRODUCT_NAME: bitchat INFOPLIST_FILE: bitchat/Info.plist ENABLE_PREVIEWS: YES SWIFT_VERSION: 5.0 IPHONEOS_DEPLOYMENT_TARGET: 16.0 SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: YES - CODE_SIGN_STYLE: Automatic + CODE_SIGN_STYLE: Manual CODE_SIGNING_REQUIRED: YES CODE_SIGNING_ALLOWED: YES - DEVELOPMENT_TEAM: L3N5LHJD5Y + DEVELOPMENT_TEAM: W2L75AE9HQ ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS: YES CODE_SIGN_ENTITLEMENTS: bitchat/bitchat.entitlements @@ -65,7 +65,9 @@ targets: type: application platform: macOS sources: - - bitchat + - path: bitchat + excludes: + - "LaunchScreen.storyboard" resources: - bitchat/Assets.xcassets info: @@ -81,16 +83,16 @@ targets: - CFBundleURLSchemes: - bitchat settings: - PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat + PRODUCT_BUNDLE_IDENTIFIER: com.local.bitchat PRODUCT_NAME: bitchat INFOPLIST_FILE: bitchat/Info.plist ENABLE_PREVIEWS: YES SWIFT_VERSION: 5.0 MACOSX_DEPLOYMENT_TARGET: 13.0 - CODE_SIGN_STYLE: Automatic - CODE_SIGNING_REQUIRED: YES - CODE_SIGNING_ALLOWED: YES - DEVELOPMENT_TEAM: L3N5LHJD5Y + CODE_SIGN_STYLE: Manual + CODE_SIGNING_REQUIRED: NO + CODE_SIGNING_ALLOWED: NO + DEVELOPMENT_TEAM: W2L75AE9HQ ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS: YES CODE_SIGN_ENTITLEMENTS: bitchat/bitchat.entitlements @@ -115,14 +117,14 @@ targets: NSExtensionActivationSupportsWebURLWithMaxCount: 1 NSExtensionActivationSupportsImageWithMaxCount: 1 settings: - PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat.ShareExtension + PRODUCT_BUNDLE_IDENTIFIER: com.local.bitchat.ShareExtension INFOPLIST_FILE: bitchatShareExtension/Info.plist SWIFT_VERSION: 5.0 IPHONEOS_DEPLOYMENT_TARGET: 16.0 - CODE_SIGN_STYLE: Automatic + CODE_SIGN_STYLE: Manual CODE_SIGNING_REQUIRED: YES CODE_SIGNING_ALLOWED: YES - DEVELOPMENT_TEAM: L3N5LHJD5Y + DEVELOPMENT_TEAM: W2L75AE9HQ CODE_SIGN_ENTITLEMENTS: bitchatShareExtension/bitchatShareExtension.entitlements CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION: YES @@ -134,16 +136,16 @@ targets: dependencies: - target: bitchat_iOS settings: - PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat.tests + PRODUCT_BUNDLE_IDENTIFIER: com.local.bitchat.tests INFOPLIST_FILE: bitchatTests/Info.plist SWIFT_VERSION: 5.0 IPHONEOS_DEPLOYMENT_TARGET: 16.0 TEST_HOST: $(BUILT_PRODUCTS_DIR)/bitchat.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/bitchat BUNDLE_LOADER: $(TEST_HOST) - CODE_SIGN_STYLE: Automatic + CODE_SIGN_STYLE: Manual CODE_SIGNING_REQUIRED: YES CODE_SIGNING_ALLOWED: YES - DEVELOPMENT_TEAM: L3N5LHJD5Y + DEVELOPMENT_TEAM: W2L75AE9HQ bitchatTests_macOS: type: bundle.unit-test @@ -153,16 +155,16 @@ targets: dependencies: - target: bitchat_macOS settings: - PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat.tests + PRODUCT_BUNDLE_IDENTIFIER: com.local.bitchat.tests INFOPLIST_FILE: bitchatTests/Info.plist SWIFT_VERSION: 5.0 MACOSX_DEPLOYMENT_TARGET: 13.0 TEST_HOST: $(BUILT_PRODUCTS_DIR)/bitchat.app/Contents/MacOS/bitchat BUNDLE_LOADER: $(TEST_HOST) - CODE_SIGN_STYLE: Automatic + CODE_SIGN_STYLE: Manual CODE_SIGNING_REQUIRED: YES CODE_SIGNING_ALLOWED: YES - DEVELOPMENT_TEAM: L3N5LHJD5Y + DEVELOPMENT_TEAM: W2L75AE9HQ schemes: bitchat (iOS):