Skip to content

Commit fc811bb

Browse files
philprimephilprime
committed
refactor: Moderinze example Xcode projects
1 parent 43bb84e commit fc811bb

File tree

34 files changed

+58
-535
lines changed

34 files changed

+58
-535
lines changed

‎Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 7 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 */
@@ -272,8 +272,9 @@
272272
607FACC81AFB9204008FA782 /* Project object */ = {
273273
isa = PBXProject;
274274
attributes = {
275+
BuildIndependentTargetsInParallel = YES;
275276
LastSwiftUpdateCheck = 1010;
276-
LastUpgradeCheck = 1120;
277+
LastUpgradeCheck = 2620;
277278
ORGANIZATIONNAME = "techprimate GmbH";
278279
TargetAttributes = {
279280
607FACCF1AFB9204008FA782 = {
@@ -424,6 +425,7 @@
424425
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
425426
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
426427
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
428+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
427429
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
428430
CLANG_WARN_STRICT_PROTOTYPES = YES;
429431
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -434,6 +436,7 @@
434436
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
435437
ENABLE_STRICT_OBJC_MSGSEND = YES;
436438
ENABLE_TESTABILITY = YES;
439+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
437440
GCC_C_LANGUAGE_STANDARD = gnu99;
438441
GCC_DYNAMIC_NO_PIC = NO;
439442
GCC_NO_COMMON_BLOCKS = YES;
@@ -449,10 +452,11 @@
449452
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
450453
GCC_WARN_UNUSED_FUNCTION = YES;
451454
GCC_WARN_UNUSED_VARIABLE = YES;
452-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
455+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
453456
MTL_ENABLE_DEBUG_INFO = YES;
454457
ONLY_ACTIVE_ARCH = YES;
455458
SDKROOT = iphoneos;
459+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
456460
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
457461
SWIFT_VERSION = 4.2;
458462
};
@@ -481,6 +485,7 @@
481485
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
482486
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
483487
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
488+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
484489
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
485490
CLANG_WARN_STRICT_PROTOTYPES = YES;
486491
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -491,6 +496,7 @@
491496
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
492497
ENABLE_NS_ASSERTIONS = NO;
493498
ENABLE_STRICT_OBJC_MSGSEND = YES;
499+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
494500
GCC_C_LANGUAGE_STANDARD = gnu99;
495501
GCC_NO_COMMON_BLOCKS = YES;
496502
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -499,10 +505,12 @@
499505
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
500506
GCC_WARN_UNUSED_FUNCTION = YES;
501507
GCC_WARN_UNUSED_VARIABLE = YES;
502-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
508+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
503509
MTL_ENABLE_DEBUG_INFO = NO;
504510
SDKROOT = iphoneos;
505-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
511+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
512+
SWIFT_COMPILATION_MODE = wholemodule;
513+
SWIFT_OPTIMIZATION_LEVEL = "-O";
506514
SWIFT_VERSION = 4.2;
507515
VALIDATE_PRODUCT = YES;
508516
};
@@ -523,7 +531,11 @@
523531
GCC_WARN_UNUSED_LABEL = YES;
524532
GCC_WARN_UNUSED_PARAMETER = YES;
525533
INFOPLIST_FILE = Example/Info.plist;
526-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
534+
IPHONEOS_DEPLOYMENT_TARGET = 12;
535+
LD_RUNPATH_SEARCH_PATHS = (
536+
"$(inherited)",
537+
"@executable_path/Frameworks",
538+
);
527539
MODULE_NAME = ExampleApp;
528540
PRODUCT_BUNDLE_IDENTIFIER = com.techprimate.tppdf.example;
529541
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -547,7 +559,11 @@
547559
GCC_WARN_UNUSED_LABEL = YES;
548560
GCC_WARN_UNUSED_PARAMETER = YES;
549561
INFOPLIST_FILE = Example/Info.plist;
550-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
562+
IPHONEOS_DEPLOYMENT_TARGET = 12;
563+
LD_RUNPATH_SEARCH_PATHS = (
564+
"$(inherited)",
565+
"@executable_path/Frameworks",
566+
);
551567
MODULE_NAME = ExampleApp;
552568
PRODUCT_BUNDLE_IDENTIFIER = com.techprimate.tppdf.example;
553569
PRODUCT_NAME = "$(TARGET_NAME)";

‎Example iOS-Carthage/Example_iOS-Carthage.xcodeproj/xcshareddata/xcschemes/Example iOS (Carthage).xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1530"
3+
LastUpgradeVersion = "2620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example iOS-Cocoapods/Example_iOS-Cocoapods.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
1AE6039D65546B2A47BFAE42 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92CBAD4B39E24EF1764F1983 /* Pods_Example.framework */; };
1110
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
1211
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
1312
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
1413
607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
1514
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
15+
74CBD5DF3691A05E022A7E99 /* Pods_Example_iOS_Cocoapods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0567860752D9A504DE0FF176 /* Pods_Example_iOS_Cocoapods.framework */; };
1616
D49855392461FB0B00D54270 /* ExampleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855182461FB0B00D54270 /* ExampleFactory.swift */; };
1717
D498553A2461FB0B00D54270 /* TimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49855192461FB0B00D54270 /* TimeUtils.swift */; };
1818
D498553B2461FB0B00D54270 /* LoremIpsum.swift in Sources */ = {isa = PBXBuildFile; fileRef = D498551A2461FB0B00D54270 /* LoremIpsum.swift */; };
@@ -46,7 +46,10 @@
4646
/* End PBXBuildFile section */
4747

4848
/* Begin PBXFileReference section */
49+
0567860752D9A504DE0FF176 /* Pods_Example_iOS_Cocoapods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example_iOS_Cocoapods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
50+
4819AECE971BBAE3FF3E2DD2 /* Pods-Example_iOS-Cocoapods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_iOS-Cocoapods.release.xcconfig"; path = "Target Support Files/Pods-Example_iOS-Cocoapods/Pods-Example_iOS-Cocoapods.release.xcconfig"; sourceTree = "<group>"; };
4951
4A563E64F9EAA2CFA08F14DB /* Pods-TPPDF_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TPPDF_Example.release.xcconfig"; path = "Target Support Files/Pods-TPPDF_Example/Pods-TPPDF_Example.release.xcconfig"; sourceTree = "<group>"; };
52+
4EAAB7D6321D79F8F6CD4F44 /* Pods-Example_iOS-Cocoapods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example_iOS-Cocoapods.debug.xcconfig"; path = "Target Support Files/Pods-Example_iOS-Cocoapods/Pods-Example_iOS-Cocoapods.debug.xcconfig"; sourceTree = "<group>"; };
5053
53E4A2A5504D7EA42E9FAB88 /* Pods-TPPDF_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TPPDF_Example.debug.xcconfig"; path = "Target Support Files/Pods-TPPDF_Example/Pods-TPPDF_Example.debug.xcconfig"; sourceTree = "<group>"; };
5154
607FACD01AFB9204008FA782 /* Example_iOS-Cocoapods.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example_iOS-Cocoapods.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5255
607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -55,7 +58,6 @@
5558
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5659
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
5760
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
58-
92CBAD4B39E24EF1764F1983 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5961
D49855182461FB0B00D54270 /* ExampleFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleFactory.swift; sourceTree = "<group>"; };
6062
D49855192461FB0B00D54270 /* TimeUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeUtils.swift; sourceTree = "<group>"; };
6163
D498551A2461FB0B00D54270 /* LoremIpsum.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoremIpsum.swift; sourceTree = "<group>"; };
@@ -95,7 +97,7 @@
9597
isa = PBXFrameworksBuildPhase;
9698
buildActionMask = 2147483647;
9799
files = (
98-
1AE6039D65546B2A47BFAE42 /* Pods_Example.framework in Frameworks */,
100+
74CBD5DF3691A05E022A7E99 /* Pods_Example_iOS_Cocoapods.framework in Frameworks */,
99101
);
100102
runOnlyForDeploymentPostprocessing = 0;
101103
};
@@ -109,6 +111,8 @@
109111
4A563E64F9EAA2CFA08F14DB /* Pods-TPPDF_Example.release.xcconfig */,
110112
EFCAB3FEC631A49F5625B2A1 /* Pods-Example.debug.xcconfig */,
111113
D64C495E25CC3359766E02CE /* Pods-Example.release.xcconfig */,
114+
4EAAB7D6321D79F8F6CD4F44 /* Pods-Example_iOS-Cocoapods.debug.xcconfig */,
115+
4819AECE971BBAE3FF3E2DD2 /* Pods-Example_iOS-Cocoapods.release.xcconfig */,
112116
);
113117
path = Pods;
114118
sourceTree = "<group>";
@@ -153,7 +157,7 @@
153157
9B6E20EC5D56BBD192BCBFFD /* Frameworks */ = {
154158
isa = PBXGroup;
155159
children = (
156-
92CBAD4B39E24EF1764F1983 /* Pods_Example.framework */,
160+
0567860752D9A504DE0FF176 /* Pods_Example_iOS_Cocoapods.framework */,
157161
);
158162
name = Frameworks;
159163
sourceTree = "<group>";
@@ -342,7 +346,7 @@
342346
files = (
343347
);
344348
inputPaths = (
345-
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
349+
"${PODS_ROOT}/Target Support Files/Pods-Example_iOS-Cocoapods/Pods-Example_iOS-Cocoapods-frameworks.sh",
346350
"${BUILT_PRODUCTS_DIR}/TPPDF/TPPDF.framework",
347351
);
348352
name = "[CP] Embed Pods Frameworks";
@@ -351,7 +355,7 @@
351355
);
352356
runOnlyForDeploymentPostprocessing = 0;
353357
shellPath = /bin/sh;
354-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
358+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example_iOS-Cocoapods/Pods-Example_iOS-Cocoapods-frameworks.sh\"\n";
355359
showEnvVarsInLog = 0;
356360
};
357361
E638F0EEF355F6576E268BF8 /* [CP] Check Pods Manifest.lock */ = {
@@ -369,7 +373,7 @@
369373
outputFileListPaths = (
370374
);
371375
outputPaths = (
372-
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
376+
"$(DERIVED_FILE_DIR)/Pods-Example_iOS-Cocoapods-checkManifestLockResult.txt",
373377
);
374378
runOnlyForDeploymentPostprocessing = 0;
375379
shellPath = /bin/sh;
@@ -541,7 +545,7 @@
541545
};
542546
607FACF01AFB9204008FA782 /* Debug */ = {
543547
isa = XCBuildConfiguration;
544-
baseConfigurationReference = EFCAB3FEC631A49F5625B2A1 /* Pods-Example.debug.xcconfig */;
548+
baseConfigurationReference = 4EAAB7D6321D79F8F6CD4F44 /* Pods-Example_iOS-Cocoapods.debug.xcconfig */;
545549
buildSettings = {
546550
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
547551
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -562,7 +566,7 @@
562566
};
563567
607FACF11AFB9204008FA782 /* Release */ = {
564568
isa = XCBuildConfiguration;
565-
baseConfigurationReference = D64C495E25CC3359766E02CE /* Pods-Example.release.xcconfig */;
569+
baseConfigurationReference = 4819AECE971BBAE3FF3E2DD2 /* Pods-Example_iOS-Cocoapods.release.xcconfig */;
566570
buildSettings = {
567571
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
568572
CODE_SIGN_IDENTITY = "iPhone Developer";

‎Example iOS-Cocoapods/Example_iOS-Cocoapods.xcodeproj/xcshareddata/xcschemes/Example iOS (Cocoapods).xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1530"
3+
LastUpgradeVersion = "2620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example iOS-Cocoapods/Example.xcworkspace/contents.xcworkspacedata renamed to Example iOS-Cocoapods/Example_iOS-Cocoapods.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example iOS-Cocoapods/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ source 'https://cdn.cocoapods.org/'
33
platform :ios, "13.5"
44
use_frameworks!
55

6-
target "Example" do
6+
target "Example_iOS-Cocoapods" do
77
pod "TPPDF", :path => "../"
88
end

‎Example iOS-Cocoapods/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- TPPDF (2.1.1)
2+
- TPPDF (2.6.1)
33

44
DEPENDENCIES:
55
- TPPDF (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../"
1010

1111
SPEC CHECKSUMS:
12-
TPPDF: 42ef4e56334d21ce1be3b984bb86b7d479b43c7f
12+
TPPDF: 872922502e0921fb2d04be8b60b04902336d7cdf
1313

14-
PODFILE CHECKSUM: fca7096d4ac23608449a47d714a74e0e1a79dcf1
14+
PODFILE CHECKSUM: 2c118f182f7684945d1d72db9a00382f7352587a
1515

16-
COCOAPODS: 1.9.3
16+
COCOAPODS: 1.16.2

‎Example iOS-SwiftPM/Example_iOS-SPM.xcodeproj/xcshareddata/xcschemes/Example iOS (SPM).xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1530"
3+
LastUpgradeVersion = "2620"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example macOS/Example/AppDelegate.swift renamed to Example macOS-SwiftPM/Example/AppDelegate.swift

File renamed without changes.

Example macOS/Example/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to Example macOS-SwiftPM/Example/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

0 commit comments

Comments
 (0)