Resolve rebase/stash conflict in project.pbxproj: keep single tor-nolzma reference and clean markers

Fix compile error: attach .padding(.top) inside #if DEBUG so modifier applies to view expression
Debug: add in-memory log buffer and AppInfoView debug section with copy/clear logs (DEBUG only)
2026-07-25 20:25:19 +00:00 · 2025-09-13 23:15:36 +02:00 · 2025-09-13 23:11:38 +02:00 · 2025-09-13 23:11:38 +02:00
2417 changed files with 11069 additions and 53960 deletions
@@ -1,20 +0,0 @@
 # Prevent Github Languages stats skewing:
 # Binaries and assets
 **/*.xcframework/** linguist-vendored
 **/*.xcassets/** linguist-vendored
 # Generated files
 **/*.pbxproj linguist-generated
 **/*.storyboard linguist-generated
 Package.resolved linguist-generated
 # Downloaded CSVs
 relays/online_relays_gps.csv linguist-vendored
 # Docs
 **/*.md linguist-documentation
 # Configs
 Configs/*.xcconfig linguist-documentation
 **/*.plist linguist-documentation
@@ -24,4 +24,4 @@ jobs:
        run: swift build
      - name: Run Tests
-        run: swift test --parallel
+        run: swift test --parallel --disable-swift-testing  # so it only runs xctests: https://github.com/swiftlang/swift-package-manager/issues/8529#issuecomment-2815711345
@@ -9,6 +9,9 @@ plans/
 CLAUDE.md
 AGENTS.md
 ## User settings
 xcuserdata/
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 *.xcscmblueprint
 *.xccheckout
@@ -54,8 +57,7 @@ iOSInjectionProject/
 ## Xcode project
 *.xcodeproj/project.xcworkspace/
-## Xcode User settings
+*.xcodeproj/xcshareddata/
 xcuserdata/
 ## Python
 __pycache__/
@@ -66,9 +68,6 @@ __pycache__/
 *.tmp
 *.temp
 ## Cache
 .cache/
 # Local build results
 .Result*/
 .Result*.xcresult/
@@ -76,6 +75,3 @@ TestResult.xcresult/
 *.xcresult/
 build.log
 *.log
 # Local configs
 Local.xcconfig
@@ -1,4 +0,0 @@
 #include "Release.xcconfig"
 // Optional include of local configs
 #include? "Local.xcconfig"
@@ -1,5 +0,0 @@
 // Your Apple Developer Team ID - https://stackoverflow.com/a/18727947
 DEVELOPMENT_TEAM = ABC123
 // Unique bundle id to be able to register and run locally
 PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.$(DEVELOPMENT_TEAM)
@@ -1,11 +0,0 @@
 MARKETING_VERSION = 1.5.0
 CURRENT_PROJECT_VERSION = 1
 IPHONEOS_DEPLOYMENT_TARGET = 16.0
 MACOSX_DEPLOYMENT_TARGET = 13.0
 SWIFT_VERSION = 5.0
 DEVELOPMENT_TEAM = L3N5LHJD5Y
 CODE_SIGN_STYLE = Automatic
 PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jack	a8887e7318	Resolve rebase/stash conflict in project.pbxproj: keep single tor-nolzma reference and clean markers	2025-09-13 23:15:36 +02:00
jack	63918bfebc	Fix compile error: attach .padding(.top) inside #if DEBUG so modifier applies to view expression	2025-09-13 23:11:38 +02:00
jack	b30a30ecce	Debug: add in-memory log buffer and AppInfoView debug section with copy/clear logs (DEBUG only)	2025-09-13 23:11:38 +02:00