From 4529a68309a9315573a80330a4ece9ad6f080f8c Mon Sep 17 00:00:00 2001 From: jack Date: Sun, 6 Jul 2025 21:35:35 +0200 Subject: [PATCH] Revert project configuration changes and add DeliveryTracker - Reverted project.yml to simpler original format - Reverted project.pbxproj to avoid screen issues - Added DeliveryTracker.swift to the project files --- bitchat.xcodeproj/project.pbxproj | 32 ++++++------- project.yml | 79 +++++++------------------------ 2 files changed, 32 insertions(+), 79 deletions(-) diff --git a/bitchat.xcodeproj/project.pbxproj b/bitchat.xcodeproj/project.pbxproj index 7bce8ffb..2feb9835 100644 --- a/bitchat.xcodeproj/project.pbxproj +++ b/bitchat.xcodeproj/project.pbxproj @@ -84,9 +84,9 @@ 67A85BFDDE65B4CD8BDF6DDB /* MessageRetentionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRetentionService.swift; sourceTree = ""; }; 6DC1563390A15C042D059CF9 /* EncryptionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionService.swift; sourceTree = ""; }; 763E0DBA9492A654FC0CDCB9 /* AppInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfoView.swift; sourceTree = ""; }; + 7EEBDA723E1CFD88758DA4AC /* bitchat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = bitchat.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8DE9CDF66D4E52D268851048 /* MessagePaddingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePaddingTests.swift; sourceTree = ""; }; - 8F3A7C058C2C8E1A06C8CF8B /* bitchat_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = bitchat_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 96D0D41CA19EE5A772AA8434 /* bitchat_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = bitchat_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 997D512074C64904D75DDD40 /* bitchat.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = bitchat.app; sourceTree = BUILT_PRODUCTS_DIR; }; A08E03AA0C63E97C91749AEC /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; A2136C3E22D02D4A8DBE7EAB /* BinaryProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BinaryProtocol.swift; sourceTree = ""; }; AA4D7595A613F7ED3B386132 /* MessageRetryService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageRetryService.swift; sourceTree = ""; }; @@ -147,8 +147,8 @@ 9F37F9F2C353B58AC809E93B /* Products */ = { isa = PBXGroup; children = ( - 96D0D41CA19EE5A772AA8434 /* bitchat_iOS.app */, - 8F3A7C058C2C8E1A06C8CF8B /* bitchat_macOS.app */, + 997D512074C64904D75DDD40 /* bitchat.app */, + 7EEBDA723E1CFD88758DA4AC /* bitchat.app */, C0DB1DE27F0AAB5092663E8E /* bitchatTests_iOS.xctest */, 03C57F452B55FD0FD8F51421 /* bitchatTests_macOS.xctest */, ); @@ -218,7 +218,7 @@ packageProductDependencies = ( ); productName = bitchat_macOS; - productReference = 8F3A7C058C2C8E1A06C8CF8B /* bitchat_macOS.app */; + productReference = 7EEBDA723E1CFD88758DA4AC /* bitchat.app */; productType = "com.apple.product-type.application"; }; 47FF23248747DD7CB666CB91 /* bitchatTests_macOS */ = { @@ -272,7 +272,7 @@ packageProductDependencies = ( ); productName = bitchat_iOS; - productReference = 96D0D41CA19EE5A772AA8434 /* bitchat_iOS.app */; + productReference = 997D512074C64904D75DDD40 /* bitchat.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -432,7 +432,6 @@ "@loader_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; - PRODUCT_NAME = bitchatTests; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -452,7 +451,6 @@ "@loader_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; - PRODUCT_NAME = bitchatTests; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -473,7 +471,6 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; - PRODUCT_NAME = bitchatTests; SDKROOT = macosx; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bitchat.app/Contents/MacOS/bitchat"; @@ -496,10 +493,11 @@ "$(inherited)", "@executable_path/Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; PRODUCT_NAME = bitchat; SDKROOT = iphoneos; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -518,7 +516,6 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.tests; - PRODUCT_NAME = bitchatTests; SDKROOT = macosx; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bitchat.app/Contents/MacOS/bitchat"; @@ -541,10 +538,11 @@ "$(inherited)", "@executable_path/Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; PRODUCT_NAME = bitchat; SDKROOT = iphoneos; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -559,9 +557,9 @@ CODE_SIGNING_REQUIRED = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = bitchat/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -570,6 +568,7 @@ PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; PRODUCT_NAME = bitchat; SDKROOT = macosx; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; }; name = Release; @@ -608,7 +607,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -641,9 +640,9 @@ CODE_SIGNING_REQUIRED = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = bitchat/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -652,6 +651,7 @@ PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat; PRODUCT_NAME = bitchat; SDKROOT = macosx; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; }; name = Debug; @@ -690,7 +690,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; diff --git a/project.yml b/project.yml index 9eebbd20..6741aebd 100644 --- a/project.yml +++ b/project.yml @@ -5,62 +5,17 @@ options: iOS: 16.0 macOS: 13.0 createIntermediateGroups: true - groupSortPosition: bottom settings: MARKETING_VERSION: 1.0.0 - CURRENT_PROJECT_VERSION: 5 + CURRENT_PROJECT_VERSION: 1 targets: - bitchat_iOS: + bitchat: type: application - platform: iOS + platform: [iOS, macOS] sources: - - path: bitchat - excludes: - - "**/.DS_Store" - createIntermediateGroups: true - resources: - - bitchat/Assets.xcassets - info: - path: bitchat/Info.plist - properties: - CFBundleDisplayName: bitchat - CFBundleShortVersionString: $(MARKETING_VERSION) - CFBundleVersion: $(CURRENT_PROJECT_VERSION) - NSBluetoothAlwaysUsageDescription: 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. - NSUserNotificationAlertStyle: alert - UIBackgroundModes: - - bluetooth-central - - bluetooth-peripheral - - remote-notification - UILaunchScreen: - UIColorName: Black - UISupportedInterfaceOrientations: - - UIInterfaceOrientationPortrait - settings: - PRODUCT_NAME: bitchat - PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat - INFOPLIST_FILE: bitchat/Info.plist - ENABLE_PREVIEWS: YES - SWIFT_VERSION: 5.0 - IPHONEOS_DEPLOYMENT_TARGET: 16.0 - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO - CODE_SIGN_STYLE: Automatic - CODE_SIGNING_REQUIRED: YES - CODE_SIGNING_ALLOWED: YES - ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon - ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS: YES - - bitchat_macOS: - type: application - platform: macOS - sources: - - path: bitchat - excludes: - - "**/.DS_Store" - createIntermediateGroups: true + - bitchat resources: - bitchat/Assets.xcassets info: @@ -72,33 +27,35 @@ targets: LSMinimumSystemVersion: $(MACOSX_DEPLOYMENT_TARGET) NSBluetoothAlwaysUsageDescription: 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. - NSUserNotificationAlertStyle: alert + UIBackgroundModes: + - bluetooth-central + - bluetooth-peripheral + UILaunchScreen: + UIColorName: Black + UISupportedInterfaceOrientations: + - UIInterfaceOrientationPortrait settings: - PRODUCT_NAME: bitchat PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat INFOPLIST_FILE: bitchat/Info.plist ENABLE_PREVIEWS: YES SWIFT_VERSION: 5.0 + IPHONEOS_DEPLOYMENT_TARGET: 16.0 MACOSX_DEPLOYMENT_TARGET: 13.0 + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: YES CODE_SIGN_STYLE: Automatic CODE_SIGNING_REQUIRED: YES CODE_SIGNING_ALLOWED: YES ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS: YES - ENABLE_HARDENED_RUNTIME: YES bitchatTests_iOS: type: bundle.unit-test platform: iOS sources: - - path: bitchatTests - excludes: - - "**/.DS_Store" - createIntermediateGroups: true + - bitchatTests dependencies: - target: bitchat_iOS settings: - PRODUCT_NAME: bitchatTests PRODUCT_BUNDLE_IDENTIFIER: chat.bitchat.tests INFOPLIST_FILE: bitchatTests/Info.plist SWIFT_VERSION: 5.0 @@ -110,17 +67,13 @@ targets: type: bundle.unit-test platform: macOS sources: - - path: bitchatTests - excludes: - - "**/.DS_Store" - createIntermediateGroups: true + - bitchatTests dependencies: - target: bitchat_macOS settings: - PRODUCT_NAME: bitchatTests PRODUCT_BUNDLE_IDENTIFIER: chat.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) \ No newline at end of file + BUNDLE_LOADER: $(TEST_HOST)