Skip to content

Commit 2357f7f

Browse files
debuglydebugly
committed
upgrade ios demo
1 parent 720374b commit 2357f7f

30 files changed

Lines changed: 247 additions & 2459 deletions

File tree

‎ios/IJKMediaDemo/IJKMediaDemo.xcodeproj/project.pbxproj‎

Lines changed: 92 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -20,6 +20,8 @@
2020
55E809F31B146DE8003E98A5 /* IJKQRCodeScanViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55E809F21B146DE8003E98A5 /* IJKQRCodeScanViewController.xib */; };
2121
55E809F61B1480BC003E98A5 /* IJKDemoHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E809F51B1480BC003E98A5 /* IJKDemoHistory.m */; };
2222
55E809F91B15A1DB003E98A5 /* IJKDemoLocalFolderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E809F81B15A1DB003E98A5 /* IJKDemoLocalFolderViewController.m */; };
23+
C9644FDA2D87BDFF003875C0 /* IJKMediaFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9644FD62D87B80F003875C0 /* IJKMediaFramework.framework */; };
24+
C9644FDB2D87BDFF003875C0 /* IJKMediaFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C9644FD62D87B80F003875C0 /* IJKMediaFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2325
E60E8C2A19EF70BB005B5B6E /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E60E8C2919EF70BB005B5B6E /* CoreMedia.framework */; };
2426
E612EAE517F7E0F800BEE660 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E612EAE417F7E0F800BEE660 /* MediaPlayer.framework */; };
2527
E6166C9C17EDA4A20006B956 /* IJKMediaDemo-Prefix.pch in Resources */ = {isa = PBXBuildFile; fileRef = E6166C9B17EDA4A20006B956 /* IJKMediaDemo-Prefix.pch */; };
@@ -28,7 +30,6 @@
2830
E63FC2B417F172EA003551EB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E63FC2B317F172E9003551EB /* OpenGLES.framework */; };
2931
E64D4F4E1938CCCC00F1C75D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E64D4F4D1938CCCC00F1C75D /* CoreGraphics.framework */; };
3032
E64D4F4F1938CD2100F1C75D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E63FC2B717F17362003551EB /* QuartzCore.framework */; };
31-
E654EAF01B6B2A7900B0F2D0 /* IJKMediaFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */; };
3233
E66F8DCB17EEDD8B00354D80 /* IJKMediaControl.m in Sources */ = {isa = PBXBuildFile; fileRef = E66F8DCA17EEDD8B00354D80 /* IJKMediaControl.m */; };
3334
E67323A71B69E6F800CB9036 /* AppIcons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E67323A51B69E6F800CB9036 /* AppIcons.xcassets */; };
3435
E67323A81B69E6F800CB9036 /* LaunchImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E67323A61B69E6F800CB9036 /* LaunchImages.xcassets */; };
@@ -50,11 +51,18 @@
5051
/* End PBXBuildFile section */
5152

5253
/* Begin PBXContainerItemProxy section */
53-
E654EAD61B6B28B100B0F2D0 /* PBXContainerItemProxy */ = {
54+
C9644FD52D87B80F003875C0 /* PBXContainerItemProxy */ = {
5455
isa = PBXContainerItemProxy;
5556
containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
5657
proxyType = 2;
57-
remoteGlobalIDString = E654EA8A1B6B27E600B0F2D0;
58+
remoteGlobalIDString = 5450B0431E63EA4300568494;
59+
remoteInfo = IJKMediaFrameworkWithSSL;
60+
};
61+
C9644FDE2D87C03D003875C0 /* PBXContainerItemProxy */ = {
62+
isa = PBXContainerItemProxy;
63+
containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
64+
proxyType = 1;
65+
remoteGlobalIDString = 5450AFC11E63EA4300568494;
5866
remoteInfo = IJKMediaFramework;
5967
};
6068
E654EAD81B6B28B100B0F2D0 /* PBXContainerItemProxy */ = {
@@ -64,15 +72,22 @@
6472
remoteGlobalIDString = E654EA941B6B27E600B0F2D0;
6573
remoteInfo = IJKMediaFrameworkTests;
6674
};
67-
E654EAEE1B6B2A1500B0F2D0 /* PBXContainerItemProxy */ = {
68-
isa = PBXContainerItemProxy;
69-
containerPortal = E6D74F2918A5F94B00165BFD /* IJKMediaPlayer.xcodeproj */;
70-
proxyType = 1;
71-
remoteGlobalIDString = E654EA891B6B27E600B0F2D0;
72-
remoteInfo = IJKMediaFramework;
73-
};
7475
/* End PBXContainerItemProxy section */
7576

77+
/* Begin PBXCopyFilesBuildPhase section */
78+
C9644FDC2D87BDFF003875C0 /* Embed Frameworks */ = {
79+
isa = PBXCopyFilesBuildPhase;
80+
buildActionMask = 2147483647;
81+
dstPath = "";
82+
dstSubfolderSpec = 10;
83+
files = (
84+
C9644FDB2D87BDFF003875C0 /* IJKMediaFramework.framework in Embed Frameworks */,
85+
);
86+
name = "Embed Frameworks";
87+
runOnlyForDeploymentPostprocessing = 0;
88+
};
89+
/* End PBXCopyFilesBuildPhase section */
90+
7691
/* Begin PBXFileReference section */
7792
45D57D601A53233200BDD389 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
7893
45D57D621A53233800BDD389 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
@@ -137,12 +152,12 @@
137152
546736C41E2371AE00FEE0DF /* libstdc++.tbd in Frameworks */,
138153
E63FC29117F04C83003551EB /* AudioToolbox.framework in Frameworks */,
139154
E61B45AE19EF7021002792EC /* AVFoundation.framework in Frameworks */,
155+
C9644FDA2D87BDFF003875C0 /* IJKMediaFramework.framework in Frameworks */,
140156
E64D4F4E1938CCCC00F1C75D /* CoreGraphics.framework in Frameworks */,
141157
E60E8C2A19EF70BB005B5B6E /* CoreMedia.framework in Frameworks */,
142158
45D57D611A53233200BDD389 /* CoreVideo.framework in Frameworks */,
143159
E6F1D4C01D38F29D00E8665B /* libbz2.tbd in Frameworks */,
144160
E6F1D4BE1D38F29800E8665B /* libz.tbd in Frameworks */,
145-
E654EAF01B6B2A7900B0F2D0 /* IJKMediaFramework.framework in Frameworks */,
146161
E612EAE517F7E0F800BEE660 /* MediaPlayer.framework in Frameworks */,
147162
E67323B11B69ECF500CB9036 /* MobileCoreServices.framework in Frameworks */,
148163
E63FC2B417F172EA003551EB /* OpenGLES.framework in Frameworks */,
@@ -273,7 +288,7 @@
273288
E6D74F2A18A5F94B00165BFD /* Products */ = {
274289
isa = PBXGroup;
275290
children = (
276-
E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */,
291+
C9644FD62D87B80F003875C0 /* IJKMediaFramework.framework */,
277292
E654EAD91B6B28B100B0F2D0 /* IJKMediaFrameworkTests.xctest */,
278293
);
279294
name = Products;
@@ -289,11 +304,12 @@
289304
E6903EF817EAF70200CFD954 /* Sources */,
290305
E6903EF917EAF70200CFD954 /* Frameworks */,
291306
E6903EFA17EAF70200CFD954 /* Resources */,
307+
C9644FDC2D87BDFF003875C0 /* Embed Frameworks */,
292308
);
293309
buildRules = (
294310
);
295311
dependencies = (
296-
E654EAEF1B6B2A1500B0F2D0 /* PBXTargetDependency */,
312+
C9644FDF2D87C03D003875C0 /* PBXTargetDependency */,
297313
);
298314
name = IJKMediaDemo;
299315
productName = IJKMediaDemo;
@@ -306,15 +322,22 @@
306322
E6903EF417EAF70200CFD954 /* Project object */ = {
307323
isa = PBXProject;
308324
attributes = {
325+
BuildIndependentTargetsInParallel = YES;
309326
CLASSPREFIX = IJK;
310-
LastUpgradeCheck = 0700;
327+
LastUpgradeCheck = 1620;
311328
ORGANIZATIONNAME = bilibili;
329+
TargetAttributes = {
330+
E6903EFB17EAF70200CFD954 = {
331+
DevelopmentTeam = 96C96H28CU;
332+
};
333+
};
312334
};
313335
buildConfigurationList = E6903EF717EAF70200CFD954 /* Build configuration list for PBXProject "IJKMediaDemo" */;
314336
compatibilityVersion = "Xcode 3.2";
315337
developmentRegion = English;
316338
hasScannedForEncodings = 0;
317339
knownRegions = (
340+
English,
318341
en,
319342
);
320343
mainGroup = E6903EF317EAF70200CFD954;
@@ -334,11 +357,11 @@
334357
/* End PBXProject section */
335358

336359
/* Begin PBXReferenceProxy section */
337-
E654EAD71B6B28B100B0F2D0 /* IJKMediaFramework.framework */ = {
360+
C9644FD62D87B80F003875C0 /* IJKMediaFramework.framework */ = {
338361
isa = PBXReferenceProxy;
339362
fileType = wrapper.framework;
340363
path = IJKMediaFramework.framework;
341-
remoteRef = E654EAD61B6B28B100B0F2D0 /* PBXContainerItemProxy */;
364+
remoteRef = C9644FD52D87B80F003875C0 /* PBXContainerItemProxy */;
342365
sourceTree = BUILT_PRODUCTS_DIR;
343366
};
344367
E654EAD91B6B28B100B0F2D0 /* IJKMediaFrameworkTests.xctest */ = {
@@ -396,10 +419,10 @@
396419
/* End PBXSourcesBuildPhase section */
397420

398421
/* Begin PBXTargetDependency section */
399-
E654EAEF1B6B2A1500B0F2D0 /* PBXTargetDependency */ = {
422+
C9644FDF2D87C03D003875C0 /* PBXTargetDependency */ = {
400423
isa = PBXTargetDependency;
401424
name = IJKMediaFramework;
402-
targetProxy = E654EAEE1B6B2A1500B0F2D0 /* PBXContainerItemProxy */;
425+
targetProxy = C9644FDE2D87C03D003875C0 /* PBXContainerItemProxy */;
403426
};
404427
/* End PBXTargetDependency section */
405428

@@ -419,29 +442,49 @@
419442
isa = XCBuildConfiguration;
420443
buildSettings = {
421444
ALWAYS_SEARCH_USER_PATHS = NO;
445+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
422446
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
423447
CLANG_CXX_LIBRARY = "libc++";
424448
CLANG_ENABLE_OBJC_ARC = YES;
449+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
450+
CLANG_WARN_BOOL_CONVERSION = YES;
451+
CLANG_WARN_COMMA = YES;
425452
CLANG_WARN_CONSTANT_CONVERSION = YES;
453+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
426454
CLANG_WARN_EMPTY_BODY = YES;
427455
CLANG_WARN_ENUM_CONVERSION = YES;
456+
CLANG_WARN_INFINITE_RECURSION = YES;
428457
CLANG_WARN_INT_CONVERSION = YES;
458+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
459+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
460+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
461+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
462+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
463+
CLANG_WARN_STRICT_PROTOTYPES = YES;
464+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
465+
CLANG_WARN_UNREACHABLE_CODE = YES;
429466
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
430467
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
431468
COPY_PHASE_STRIP = NO;
469+
ENABLE_STRICT_OBJC_MSGSEND = YES;
432470
ENABLE_TESTABILITY = YES;
471+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
433472
GCC_C_LANGUAGE_STANDARD = gnu99;
434473
GCC_DYNAMIC_NO_PIC = NO;
474+
GCC_NO_COMMON_BLOCKS = YES;
435475
GCC_OPTIMIZATION_LEVEL = 0;
436476
GCC_PREPROCESSOR_DEFINITIONS = (
437477
"DEBUG=1",
438478
"$(inherited)",
439479
);
440480
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
481+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
441482
GCC_WARN_ABOUT_RETURN_TYPE = YES;
483+
GCC_WARN_UNDECLARED_SELECTOR = YES;
442484
GCC_WARN_UNINITIALIZED_AUTOS = YES;
485+
GCC_WARN_UNUSED_FUNCTION = YES;
443486
GCC_WARN_UNUSED_VARIABLE = YES;
444-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
487+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
445488
ONLY_ACTIVE_ARCH = YES;
446489
SDKROOT = iphoneos;
447490
TARGETED_DEVICE_FAMILY = "1,2";
@@ -452,21 +495,41 @@
452495
isa = XCBuildConfiguration;
453496
buildSettings = {
454497
ALWAYS_SEARCH_USER_PATHS = NO;
498+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
455499
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
456500
CLANG_CXX_LIBRARY = "libc++";
457501
CLANG_ENABLE_OBJC_ARC = YES;
502+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
503+
CLANG_WARN_BOOL_CONVERSION = YES;
504+
CLANG_WARN_COMMA = YES;
458505
CLANG_WARN_CONSTANT_CONVERSION = YES;
506+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
459507
CLANG_WARN_EMPTY_BODY = YES;
460508
CLANG_WARN_ENUM_CONVERSION = YES;
509+
CLANG_WARN_INFINITE_RECURSION = YES;
461510
CLANG_WARN_INT_CONVERSION = YES;
511+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
512+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
513+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
514+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
515+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
516+
CLANG_WARN_STRICT_PROTOTYPES = YES;
517+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
518+
CLANG_WARN_UNREACHABLE_CODE = YES;
462519
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
463520
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
464521
COPY_PHASE_STRIP = YES;
522+
ENABLE_STRICT_OBJC_MSGSEND = YES;
523+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
465524
GCC_C_LANGUAGE_STANDARD = gnu99;
525+
GCC_NO_COMMON_BLOCKS = YES;
526+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
466527
GCC_WARN_ABOUT_RETURN_TYPE = YES;
528+
GCC_WARN_UNDECLARED_SELECTOR = YES;
467529
GCC_WARN_UNINITIALIZED_AUTOS = YES;
530+
GCC_WARN_UNUSED_FUNCTION = YES;
468531
GCC_WARN_UNUSED_VARIABLE = YES;
469-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
532+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
470533
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
471534
SDKROOT = iphoneos;
472535
TARGETED_DEVICE_FAMILY = "1,2";
@@ -481,12 +544,13 @@
481544
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
482545
CODE_SIGN_IDENTITY = "iPhone Developer";
483546
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
547+
DEVELOPMENT_TEAM = 96C96H28CU;
548+
FRAMEWORK_SEARCH_PATHS = $BUILT_PRODUCTS_DIR;
484549
GCC_PRECOMPILE_PREFIX_HEADER = YES;
485550
GCC_PREFIX_HEADER = "IJKMediaDemo/IJKMediaDemo-Prefix.pch";
486551
INFOPLIST_FILE = "IJKMediaDemo/IJKMediaDemo-Info.plist";
487-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
488-
LIBRARY_SEARCH_PATHS = "$(inherited)";
489-
PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.${PRODUCT_NAME:rfc1034identifier}";
552+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
553+
PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.$(PRODUCT_NAME).${DEVELOPMENT_TEAM}";
490554
PRODUCT_NAME = "$(TARGET_NAME)";
491555
PROVISIONING_PROFILE = "";
492556
TARGETED_DEVICE_FAMILY = 1;
@@ -501,12 +565,13 @@
501565
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
502566
CODE_SIGN_IDENTITY = "iPhone Developer";
503567
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
568+
DEVELOPMENT_TEAM = 96C96H28CU;
569+
FRAMEWORK_SEARCH_PATHS = $BUILT_PRODUCTS_DIR;
504570
GCC_PRECOMPILE_PREFIX_HEADER = YES;
505571
GCC_PREFIX_HEADER = "IJKMediaDemo/IJKMediaDemo-Prefix.pch";
506572
INFOPLIST_FILE = "IJKMediaDemo/IJKMediaDemo-Info.plist";
507-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
508-
LIBRARY_SEARCH_PATHS = "$(inherited)";
509-
PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.${PRODUCT_NAME:rfc1034identifier}";
573+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
574+
PRODUCT_BUNDLE_IDENTIFIER = "tv.danmaku.$(PRODUCT_NAME).${DEVELOPMENT_TEAM}";
510575
PRODUCT_NAME = "$(TARGET_NAME)";
511576
PROVISIONING_PROFILE = "";
512577
TARGETED_DEVICE_FAMILY = 1;

‎ios/IJKMediaPlayer/IJKMediaFrameworkWithSSL.plist‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎ios/IJKMediaPlayer/IJKMediaFrameworkWithSSL/IJKMediaFrameworkWithSSL.h‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)