Skip to content

Commit 4d2e80d

Browse files
yulingtianxiayulingtianxia
committed
fix: pod lint
remove target: tvOS
1 parent d32827b commit 4d2e80d

File tree

13 files changed

+66
-20
lines changed

13 files changed

+66
-20
lines changed

‎BlockHook.podspec

+13-10
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,23 @@ s.author = { "yulingtianxia" => "[email protected]" }
1212
s.social_media_url = 'https://twitter.com/yulingtianxia'
1313
s.source = { :git => "https://github.com/yulingtianxia/BlockHook.git", :tag => s.version.to_s }
1414

15-
s.source_files = "BlockHook/*.{h,m}", "libffi/*.h"
15+
s.source_files = "BlockHook/*.{h,m}"
1616
s.public_header_files = "BlockHook/BlockHook.h", "BlockHook/BHToken.h", "BlockHook/BHInvocation.h"
1717
s.static_framework = true
18-
19-
s.ios.deployment_target = "8.0"
20-
s.osx.deployment_target = "10.10"
21-
s.tvos.deployment_target = "9.0"
22-
#s.watchos.deployment_target = "1.0"
18+
s.pod_target_xcconfig = {
19+
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
20+
}
2321
s.requires_arc = true
2422

25-
s.ios.vendored_libraries = "libffi/*.a"
26-
s.osx.vendored_libraries = "libffi/*.a"
27-
s.tvos.vendored_libraries = "libffi/*.a"
28-
#s.watchos.vendored_libraries = "libffi/*.a"
23+
s.ios.deployment_target = "12.0"
24+
s.osx.deployment_target = "10.13"
25+
# s.tvos.deployment_target = "12.0"
26+
# s.watchos.deployment_target = "4.0"
27+
28+
s.ios.vendored_frameworks = "libffi.xcframework"
29+
s.osx.vendored_frameworks = "libffi.xcframework"
30+
# s.tvos.vendored_frameworks = "libffi.xcframework"
31+
# s.watchos.vendored_frameworks = "libffi.xcframework"
2932

3033
end
3134

‎BlockHook/BHHelper.h

+4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88

99
#import <Foundation/Foundation.h>
1010
#import "BHToken+Private.h"
11+
#if COCOAPODS
12+
#import "ffi.h"
13+
#else
1114
#import <ffi.h>
15+
#endif
1216

1317
#ifdef __cplusplus
1418
#define BH_EXTERN extern "C" __attribute__((visibility("default"))) __attribute((used))

‎BlockHook/BHToken.m

+4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
//
88

99
#import "BHToken.h"
10+
#if COCOAPODS
11+
#import "ffi.h"
12+
#else
1013
#import <ffi.h>
14+
#endif
1115
#import <dlfcn.h>
1216
#import <objc/runtime.h>
1317

‎BlockHookSample.xcodeproj/project.pbxproj

+39-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -689,7 +689,8 @@
689689
A46E6BF320446489000D1DAA /* Project object */ = {
690690
isa = PBXProject;
691691
attributes = {
692-
LastUpgradeCheck = 1320;
692+
BuildIndependentTargetsInParallel = YES;
693+
LastUpgradeCheck = 1520;
693694
ORGANIZATIONNAME = "杨萧玉";
694695
TargetAttributes = {
695696
A4399BAE226A20BC00BF15CA = {
@@ -1078,6 +1079,7 @@
10781079
CODE_SIGN_IDENTITY = "Mac Developer";
10791080
CODE_SIGN_STYLE = Automatic;
10801081
COMBINE_HIDPI_IMAGES = YES;
1082+
DEAD_CODE_STRIPPING = YES;
10811083
DEVELOPMENT_TEAM = D3RCVUP6VH;
10821084
INFOPLIST_FILE = BlockHookSampleTests/Info.plist;
10831085
LD_RUNPATH_SEARCH_PATHS = (
@@ -1103,6 +1105,7 @@
11031105
CODE_SIGN_IDENTITY = "Mac Developer";
11041106
CODE_SIGN_STYLE = Automatic;
11051107
COMBINE_HIDPI_IMAGES = YES;
1108+
DEAD_CODE_STRIPPING = YES;
11061109
DEVELOPMENT_TEAM = D3RCVUP6VH;
11071110
INFOPLIST_FILE = BlockHookSampleTests/Info.plist;
11081111
LD_RUNPATH_SEARCH_PATHS = (
@@ -1223,6 +1226,7 @@
12231226
DYLIB_COMPATIBILITY_VERSION = 1;
12241227
DYLIB_CURRENT_VERSION = 1;
12251228
DYLIB_INSTALL_NAME_BASE = "@rpath";
1229+
ENABLE_MODULE_VERIFIER = YES;
12261230
HEADER_SEARCH_PATHS = "";
12271231
INFOPLIST_FILE = BlockHook/Info.plist;
12281232
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1232,6 +1236,8 @@
12321236
"@loader_path/Frameworks",
12331237
);
12341238
LIBRARY_SEARCH_PATHS = "$(inherited)";
1239+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1240+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
12351241
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
12361242
MTL_FAST_MATH = YES;
12371243
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
@@ -1257,6 +1263,7 @@
12571263
DYLIB_COMPATIBILITY_VERSION = 1;
12581264
DYLIB_CURRENT_VERSION = 1;
12591265
DYLIB_INSTALL_NAME_BASE = "@rpath";
1266+
ENABLE_MODULE_VERIFIER = YES;
12601267
HEADER_SEARCH_PATHS = "";
12611268
INFOPLIST_FILE = BlockHook/Info.plist;
12621269
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1266,6 +1273,8 @@
12661273
"@loader_path/Frameworks",
12671274
);
12681275
LIBRARY_SEARCH_PATHS = "$(inherited)";
1276+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1277+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
12691278
MTL_FAST_MATH = YES;
12701279
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
12711280
PRODUCT_NAME = BlockHook;
@@ -1282,6 +1291,7 @@
12821291
isa = XCBuildConfiguration;
12831292
buildSettings = {
12841293
ALWAYS_SEARCH_USER_PATHS = NO;
1294+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
12851295
CLANG_ANALYZER_NONNULL = YES;
12861296
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
12871297
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1316,6 +1326,7 @@
13161326
ENABLE_BITCODE = NO;
13171327
ENABLE_STRICT_OBJC_MSGSEND = YES;
13181328
ENABLE_TESTABILITY = YES;
1329+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
13191330
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
13201331
GCC_C_LANGUAGE_STANDARD = gnu11;
13211332
GCC_DYNAMIC_NO_PIC = NO;
@@ -1342,6 +1353,7 @@
13421353
isa = XCBuildConfiguration;
13431354
buildSettings = {
13441355
ALWAYS_SEARCH_USER_PATHS = NO;
1356+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
13451357
CLANG_ANALYZER_NONNULL = YES;
13461358
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
13471359
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1376,6 +1388,7 @@
13761388
ENABLE_BITCODE = NO;
13771389
ENABLE_NS_ASSERTIONS = NO;
13781390
ENABLE_STRICT_OBJC_MSGSEND = YES;
1391+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
13791392
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
13801393
GCC_C_LANGUAGE_STANDARD = gnu11;
13811394
GCC_NO_COMMON_BLOCKS = YES;
@@ -1438,11 +1451,13 @@
14381451
CODE_SIGN_STYLE = Automatic;
14391452
COMBINE_HIDPI_IMAGES = YES;
14401453
CURRENT_PROJECT_VERSION = 1;
1454+
DEAD_CODE_STRIPPING = YES;
14411455
DEFINES_MODULE = YES;
14421456
DEVELOPMENT_TEAM = D3RCVUP6VH;
14431457
DYLIB_COMPATIBILITY_VERSION = 1;
14441458
DYLIB_CURRENT_VERSION = 1;
14451459
DYLIB_INSTALL_NAME_BASE = "@rpath";
1460+
ENABLE_MODULE_VERIFIER = YES;
14461461
FRAMEWORK_VERSION = A;
14471462
HEADER_SEARCH_PATHS = "";
14481463
INFOPLIST_FILE = BlockHook/Info.plist;
@@ -1453,7 +1468,9 @@
14531468
"@loader_path/Frameworks",
14541469
);
14551470
LIBRARY_SEARCH_PATHS = "$(inherited)";
1456-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1471+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1472+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1473+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
14571474
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
14581475
MTL_FAST_MATH = YES;
14591476
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
@@ -1473,11 +1490,13 @@
14731490
CODE_SIGN_STYLE = Automatic;
14741491
COMBINE_HIDPI_IMAGES = YES;
14751492
CURRENT_PROJECT_VERSION = 1;
1493+
DEAD_CODE_STRIPPING = YES;
14761494
DEFINES_MODULE = YES;
14771495
DEVELOPMENT_TEAM = D3RCVUP6VH;
14781496
DYLIB_COMPATIBILITY_VERSION = 1;
14791497
DYLIB_CURRENT_VERSION = 1;
14801498
DYLIB_INSTALL_NAME_BASE = "@rpath";
1499+
ENABLE_MODULE_VERIFIER = YES;
14811500
FRAMEWORK_VERSION = A;
14821501
HEADER_SEARCH_PATHS = "";
14831502
INFOPLIST_FILE = BlockHook/Info.plist;
@@ -1488,7 +1507,9 @@
14881507
"@loader_path/Frameworks",
14891508
);
14901509
LIBRARY_SEARCH_PATHS = "$(inherited)";
1491-
MACOSX_DEPLOYMENT_TARGET = 10.10;
1510+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
1511+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1512+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
14921513
MTL_FAST_MATH = YES;
14931514
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
14941515
PRODUCT_NAME = BlockHook;
@@ -1511,6 +1532,7 @@
15111532
DYLIB_COMPATIBILITY_VERSION = 1;
15121533
DYLIB_CURRENT_VERSION = 1;
15131534
DYLIB_INSTALL_NAME_BASE = "@rpath";
1535+
ENABLE_MODULE_VERIFIER = YES;
15141536
HEADER_SEARCH_PATHS = "";
15151537
INFOPLIST_FILE = BlockHook/Info.plist;
15161538
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1520,6 +1542,8 @@
15201542
"@loader_path/Frameworks",
15211543
);
15221544
LIBRARY_SEARCH_PATHS = "$(inherited)";
1545+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1546+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
15231547
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
15241548
MTL_FAST_MATH = YES;
15251549
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
@@ -1545,6 +1569,7 @@
15451569
DYLIB_COMPATIBILITY_VERSION = 1;
15461570
DYLIB_CURRENT_VERSION = 1;
15471571
DYLIB_INSTALL_NAME_BASE = "@rpath";
1572+
ENABLE_MODULE_VERIFIER = YES;
15481573
HEADER_SEARCH_PATHS = "";
15491574
INFOPLIST_FILE = BlockHook/Info.plist;
15501575
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1554,6 +1579,8 @@
15541579
"@loader_path/Frameworks",
15551580
);
15561581
LIBRARY_SEARCH_PATHS = "$(inherited)";
1582+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1583+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
15571584
MTL_FAST_MATH = YES;
15581585
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
15591586
PRODUCT_NAME = BlockHook;
@@ -1575,6 +1602,7 @@
15751602
CODE_SIGN_IDENTITY = "Mac Developer";
15761603
CODE_SIGN_STYLE = Automatic;
15771604
COMBINE_HIDPI_IMAGES = YES;
1605+
DEAD_CODE_STRIPPING = YES;
15781606
DEVELOPMENT_TEAM = D3RCVUP6VH;
15791607
ENABLE_HARDENED_RUNTIME = YES;
15801608
HEADER_SEARCH_PATHS = "";
@@ -1601,6 +1629,7 @@
16011629
CODE_SIGN_IDENTITY = "Mac Developer";
16021630
CODE_SIGN_STYLE = Automatic;
16031631
COMBINE_HIDPI_IMAGES = YES;
1632+
DEAD_CODE_STRIPPING = YES;
16041633
DEVELOPMENT_TEAM = D3RCVUP6VH;
16051634
ENABLE_HARDENED_RUNTIME = YES;
16061635
HEADER_SEARCH_PATHS = "";
@@ -1629,6 +1658,7 @@
16291658
DYLIB_CURRENT_VERSION = 1;
16301659
DYLIB_INSTALL_NAME_BASE = "@rpath";
16311660
ENABLE_BITCODE = NO;
1661+
ENABLE_MODULE_VERIFIER = YES;
16321662
HEADER_SEARCH_PATHS = "";
16331663
INFOPLIST_FILE = BlockHook/Info.plist;
16341664
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1639,6 +1669,8 @@
16391669
"@loader_path/Frameworks",
16401670
);
16411671
LIBRARY_SEARCH_PATHS = "$(inherited)";
1672+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1673+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
16421674
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
16431675
PRODUCT_NAME = BlockHook;
16441676
SKIP_INSTALL = YES;
@@ -1660,6 +1692,7 @@
16601692
DYLIB_CURRENT_VERSION = 1;
16611693
DYLIB_INSTALL_NAME_BASE = "@rpath";
16621694
ENABLE_BITCODE = NO;
1695+
ENABLE_MODULE_VERIFIER = YES;
16631696
HEADER_SEARCH_PATHS = "";
16641697
INFOPLIST_FILE = BlockHook/Info.plist;
16651698
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1670,6 +1703,8 @@
16701703
"@loader_path/Frameworks",
16711704
);
16721705
LIBRARY_SEARCH_PATHS = "$(inherited)";
1706+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
1707+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
16731708
PRODUCT_BUNDLE_IDENTIFIER = com.yulingtianxia.BlockHook;
16741709
PRODUCT_NAME = BlockHook;
16751710
SKIP_INSTALL = YES;

‎BlockHookSample.xcodeproj/xcshareddata/xcschemes/BlockHook iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BlockHookSample.xcodeproj/xcshareddata/xcschemes/BlockHook macOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BlockHookSample.xcodeproj/xcshareddata/xcschemes/BlockHook tvOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BlockHookSample.xcodeproj/xcshareddata/xcschemes/BlockHookSample iOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BlockHookSample.xcodeproj/xcshareddata/xcschemes/BlockHookSample macOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BlockHookSample.xcodeproj/xcshareddata/xcschemes/BlockHookSample tvOS.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
3+
LastUpgradeVersion = "1520"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎libffi.xcframework/ios-arm64_armv7/Headers/libffi.a

-323 KB
Binary file not shown.

‎libffi.xcframework/ios-i386_x86_64-simulator/Headers/libffi.a

-343 KB
Binary file not shown.

‎libffi.xcframework/macos-arm64_x86_64/Headers/libffi.a

-63.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)