signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

remove SignalMessaging framework

Browse Source
This commit is contained in:
Ehren Kret 2024-03-12 03:09:39 -05:00
parent 9c03618710
commit 616aaa4c89
16 changed files with 427 additions and 921 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILDING.md
View File

@ -42,9 +42,9 @@ open Signal.xcworkspace
``` ```
In the TARGETS area of the General tab, change the Team drop down to In the TARGETS area of the General tab, change the Team drop down to
your own. You will need to do that for all the listed targets, for ex. your own. You will need to do that for all the listed targets, for ex.
Signal, SignalShareExtension, and SignalMessaging. You will need an Apple Signal, SignalShareExtension, and SignalNSE. You will need an Apple
Developer account for this. Developer account for this.
On the Capabilities tab, turn off Push Notifications, Apple Pay, On the Capabilities tab, turn off Push Notifications, Apple Pay,
Communication Notifications, and Data Protection, while keeping Background Modes Communication Notifications, and Data Protection, while keeping Background Modes

4
Podfile
View File

@ -81,9 +81,6 @@ end
# These extensions inherit all of the common pods # These extensions inherit all of the common pods
target 'SignalMessaging' do
end
target 'SignalShareExtension' do target 'SignalShareExtension' do
ui_pods ui_pods
end end
@ -280,7 +277,6 @@ end
def copy_acknowledgements def copy_acknowledgements
targets = [ targets = [
'Signal', 'Signal',
'SignalMessaging',
'SignalNSE', 'SignalNSE',
'SignalPerformanceTests', 'SignalPerformanceTests',
'SignalServiceKit', 'SignalServiceKit',

2
Podfile.lock
View File

@ -201,6 +201,6 @@ SPEC CHECKSUMS:
SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1 SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331 YYImage: f1ddd15ac032a58b78bbed1e012b50302d318331
PODFILE CHECKSUM: 4d223f03b46d9ce79ab7c3e00160230da30b4558 PODFILE CHECKSUM: 05363f1dac74474b54731934b1be952a95b94db0
COCOAPODS: 1.15.2 COCOAPODS: 1.15.2

2
Pods

@ -1 +1 @@
Subproject commit 338b3c9f26e54dd5af1b47bf30f8d7ec82b49636 Subproject commit 9d79b876b92a6175a8a28de451efd6ce5db3cead

15
Scripts/sds_codegen/sds_codegen.sh
View File

@ -4,26 +4,26 @@ set -e
# The root directory of the repo. # The root directory of the repo.
REPO_ROOT=`git rev-parse --show-toplevel` REPO_ROOT=`git rev-parse --show-toplevel`
# Clang can't resolve module imports if we haven't compiled those # Clang can't resolve module imports if we haven't compiled those
# module dependencies - which we haven't; we aren't actually compiling anything, # module dependencies - which we haven't; we aren't actually compiling anything,
# just parsing. # just parsing.
# #
# Therefore, we need to replace all module imports (@import) usage with # Therefore, we need to replace all module imports (@import) usage with
# normal imports (#import) for non-system frameworks. We shouldn't need to # normal imports (#import) for non-system frameworks. We shouldn't need to
# do this more than once (since we'll check in the changes), but there's a # do this more than once (since we'll check in the changes), but there's a
# script to do it. # script to do it.
# $REPO_ROOT/Scripts/sds_codegen/sds_swap_imports.py # $REPO_ROOT/Scripts/sds_codegen/sds_swap_imports.py
# When parsing Obj-c source files, we need to be able to import type # When parsing Obj-c source files, we need to be able to import type
# definitions for all types we use, otherwise clang will treat them # definitions for all types we use, otherwise clang will treat them
# as `long *`. # as `long *`.
# #
# This script enumerates all swift files in our codebase (including our Pods) # This script enumerates all swift files in our codebase (including our Pods)
# and generates fake Obj-c headers (.h) that @interface and @protocol # and generates fake Obj-c headers (.h) that @interface and @protocol
# stubs for each swift class. This is analogous to a very simplified # stubs for each swift class. This is analogous to a very simplified
# version of the "-Swift.h" files used by Swift for bridging. # version of the "-Swift.h" files used by Swift for bridging.
$REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes $REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
@ -31,7 +31,6 @@ $REPO_ROOT/Scripts/sds_codegen/sds_parse_swift_bridging.py --src-path . --swift
# We parse Obj-C source files (.m only, not .mm yet) to extract simple class descriptions (class name, base class, property names and types, etc.) # We parse Obj-C source files (.m only, not .mm yet) to extract simple class descriptions (class name, base class, property names and types, etc.)
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/ --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalServiceKit/ --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalShareExtension/ --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalShareExtension/ --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path SignalMessaging --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes $REPO_ROOT/Scripts/sds_codegen/sds_parse_objc.py --src-path Signal --swift-bridging-path $REPO_ROOT/Scripts/sds_codegen/sds-includes
$REPO_ROOT/Scripts/sds_codegen/sds_regenerate.sh $REPO_ROOT/Scripts/sds_codegen/sds_regenerate.sh

5
Scripts/sds_codegen/sds_parse_objc.py
View File

@ -615,7 +615,6 @@ def gather_module_headers(pods_dir_path):
for project_name in ( for project_name in (
'SignalServiceKit', 'SignalServiceKit',
'SignalMessaging',
'Signal', 'Signal',
): ):
src_dir_path = os.path.join(git_repo_path, project_name) src_dir_path = os.path.join(git_repo_path, project_name)
@ -629,13 +628,10 @@ def gather_module_headers(pods_dir_path):
def get_pch_include(file_path): def get_pch_include(file_path):
ssk_path = os.path.join(git_repo_path, 'SignalServiceKit') + os.sep ssk_path = os.path.join(git_repo_path, 'SignalServiceKit') + os.sep
sm_path = os.path.join(git_repo_path, 'SignalMessaging') + os.sep
s_path = os.path.join(git_repo_path, 'Signal') + os.sep s_path = os.path.join(git_repo_path, 'Signal') + os.sep
sae_path = os.path.join(git_repo_path, 'SignalShareExtension') + os.sep sae_path = os.path.join(git_repo_path, 'SignalShareExtension') + os.sep
if file_path.startswith(ssk_path): if file_path.startswith(ssk_path):
return os.path.join(git_repo_path, "SignalServiceKit/SignalServiceKit-prefix.pch") return os.path.join(git_repo_path, "SignalServiceKit/SignalServiceKit-prefix.pch")
elif file_path.startswith(sm_path):
return os.path.join(git_repo_path, "SignalMessaging/SignalMessaging-Prefix.pch")
elif file_path.startswith(s_path): elif file_path.startswith(s_path):
return os.path.join(git_repo_path, "Signal/Signal-Prefix.pch") return os.path.join(git_repo_path, "Signal/Signal-Prefix.pch")
elif file_path.startswith(sae_path): elif file_path.startswith(sae_path):
@ -732,7 +728,6 @@ if __name__ == "__main__":
header_include_paths = [] header_include_paths = []
header_include_paths.extend(find_header_include_paths('SignalServiceKit/src')) header_include_paths.extend(find_header_include_paths('SignalServiceKit/src'))
header_include_paths.extend(find_header_include_paths('SignalMessaging'))
# SDS code generation uses clang to parse the AST of Objective-C files. # SDS code generation uses clang to parse the AST of Objective-C files.
# We're parsing these files outside the context of an XCode workspace, # We're parsing these files outside the context of an XCode workspace,

2
Scripts/sds_codegen/sds_parse_swift_bridging.py
View File

@ -213,6 +213,4 @@ if __name__ == "__main__":
process_dir(pods_dir_path, dirname, swift_bridging_path) process_dir(pods_dir_path, dirname, swift_bridging_path)
process_dir(src_dir_path, 'SignalServiceKit', swift_bridging_path) process_dir(src_dir_path, 'SignalServiceKit', swift_bridging_path)
process_dir(src_dir_path, 'SignalMessaging', swift_bridging_path)
process_dir(src_dir_path, 'Signal', swift_bridging_path) process_dir(src_dir_path, 'Signal', swift_bridging_path)

12
Scripts/sds_codegen/sds_regenerate.sh
View File

@ -4,14 +4,14 @@ set -e
# The root directory of the repo. # The root directory of the repo.
REPO_ROOT=`git rev-parse --show-toplevel` REPO_ROOT=`git rev-parse --show-toplevel`
# Clang can't resolve module imports if we haven't compiled those # Clang can't resolve module imports if we haven't compiled those
# module dependencies - which we haven't; we aren't actually compiling anything, # module dependencies - which we haven't; we aren't actually compiling anything,
# just parsing. # just parsing.
# #
# Therefore, we need to replace all module imports (@import) usage with # Therefore, we need to replace all module imports (@import) usage with
# normal imports (#import) for non-system frameworks. We shouldn't need to # normal imports (#import) for non-system frameworks. We shouldn't need to
# do this more than once (since we'll check in the changes), but there's a # do this more than once (since we'll check in the changes), but there's a
# script to do it. # script to do it.
# $REPO_ROOT/Scripts/sds_codegen/sds_swap_imports.py # $REPO_ROOT/Scripts/sds_codegen/sds_swap_imports.py
@ -30,6 +30,4 @@ PROPERTY_ORDER_JSON="$REPO_ROOT/Scripts/sds_codegen/sds_config/sds-property_orde
GENERATE_ARGS="--record-type-swift-path $RECORD_TYPE_SWIFT --record-type-json-path $RECORD_TYPE_JSON --config-json-path $CONFIG_JSON --property-order-json-path $PROPERTY_ORDER_JSON" GENERATE_ARGS="--record-type-swift-path $RECORD_TYPE_SWIFT --record-type-json-path $RECORD_TYPE_JSON --config-json-path $CONFIG_JSON --property-order-json-path $PROPERTY_ORDER_JSON"
$REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path SignalServiceKit/ --search-path . $GENERATE_ARGS $REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path SignalServiceKit/ --search-path . $GENERATE_ARGS
$REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path SignalShareExtension/ --search-path . $GENERATE_ARGS $REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path SignalShareExtension/ --search-path . $GENERATE_ARGS
$REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path SignalMessaging/ --search-path . $GENERATE_ARGS
$REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path Signal --search-path . $GENERATE_ARGS $REPO_ROOT/Scripts/sds_codegen/sds_generate.py --src-path Signal --search-path . $GENERATE_ARGS

1
Scripts/sds_codegen/sds_swap_imports.py
View File

@ -78,5 +78,4 @@ if __name__ == "__main__":
args = parser.parse_args() args = parser.parse_args()
search_path('Signal') search_path('Signal')
search_path('SignalMessaging')
search_path('SignalServiceKit') search_path('SignalServiceKit')

3
Scripts/translation/auto-genstrings
View File

@ -8,11 +8,10 @@ cd "$REPO_ROOT"
SSK_DIR="SignalServiceKit" SSK_DIR="SignalServiceKit"
SAE_DIR="SignalShareExtension" SAE_DIR="SignalShareExtension"
SM_DIR="SignalMessaging"
SUI_DIR="SignalUI" SUI_DIR="SignalUI"
NSE_DIR="SignalNSE" NSE_DIR="SignalNSE"
TARGETS=(Signal "${SSK_DIR}" "${SAE_DIR}" "${SM_DIR}" "${NSE_DIR}" "${SUI_DIR}") TARGETS=(Signal "${SSK_DIR}" "${SAE_DIR}" "${NSE_DIR}" "${SUI_DIR}")
TMP="$(mktemp -d)" TMP="$(mktemp -d)"
STRINGFILE="Signal/translations/en.lproj/Localizable.strings" STRINGFILE="Signal/translations/en.lproj/Localizable.strings"

1
Scripts/unused_strings.py
View File

@ -33,7 +33,6 @@ def parse_args():
project_path, project_path,
[ [
"Signal/src", "Signal/src",
"SignalMessaging",
"SignalNSE", "SignalNSE",
"SignalServiceKit", "SignalServiceKit",
"SignalShareExtension", "SignalShareExtension",

1232
Signal.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

7
Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
View File

@ -74,13 +74,6 @@
BlueprintName = "SignalCoreKit" BlueprintName = "SignalCoreKit"
ReferencedContainer = "container:Pods/Pods.xcodeproj"> ReferencedContainer = "container:Pods/Pods.xcodeproj">
</BuildableReference> </BuildableReference>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "453518911FC63DBF00210559"
BuildableName = "SignalMessaging.framework"
BlueprintName = "SignalMessaging"
ReferencedContainer = "container:Signal.xcodeproj">
</BuildableReference>
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "F9C5C896289451B900548EEE" BlueprintIdentifier = "F9C5C896289451B900548EEE"

24
SignalMessaging/Info.plist
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>

18
SignalMessaging/SignalMessaging-Prefix.pch
View File

@ -1,18 +0,0 @@
//
// Copyright 2014 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
//
#import <Availability.h>
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
#import <SignalCoreKit/OWSAsserts.h>
#import <SignalCoreKit/NSObject+OWS.h>
#import <SignalServiceKit/SSKAsserts.h>
#import <SignalServiceKit/SDSDatabaseStorage+Objc.h>
#import <SignalCoreKit/SignalCoreKit-Swift.h>
#import <SignalCoreKit/SignalCoreKit.h>
#endif

14
SignalMessaging/SignalMessaging.h
View File

@ -1,14 +0,0 @@
//
// Copyright 2017 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
//
#import <Foundation/Foundation.h>
//! Project version number for SignalMessaging.
FOUNDATION_EXPORT double SignalMessagingVersionNumber;
//! Project version string for SignalMessaging.
FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
// The public headers of the framework