Skip to content

Commit ccd999f

Browse files
heoblitzheoblitz
committed
test
1 parent d1ab43b commit ccd999f

File tree

4 files changed

+83
-36
lines changed

4 files changed

+83
-36
lines changed

‎Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@
365365
DF1F2A181F17D11700BA1B97 /* Resources */,
366366
DF1F2A1B1F17D11700BA1B97 /* Embed Frameworks */,
367367
DF1F2A1E1F17D11700BA1B97 /* Run Swiftlint */,
368+
69D0138866514ACD722C835D /* [CP] Embed Pods Frameworks */,
368369
);
369370
buildRules = (
370371
);
@@ -423,6 +424,28 @@
423424
/* End PBXResourcesBuildPhase section */
424425

425426
/* Begin PBXShellScriptBuildPhase section */
427+
69D0138866514ACD722C835D /* [CP] Embed Pods Frameworks */ = {
428+
isa = PBXShellScriptBuildPhase;
429+
buildActionMask = 2147483647;
430+
files = (
431+
);
432+
inputPaths = (
433+
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
434+
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
435+
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
436+
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
437+
);
438+
name = "[CP] Embed Pods Frameworks";
439+
outputPaths = (
440+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
441+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
442+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
443+
);
444+
runOnlyForDeploymentPostprocessing = 0;
445+
shellPath = /bin/sh;
446+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh\"\n";
447+
showEnvVarsInLog = 0;
448+
};
426449
DF1F2A061F17D11700BA1B97 /* [CP] Check Pods Manifest.lock */ = {
427450
isa = PBXShellScriptBuildPhase;
428451
buildActionMask = 2147483647;

‎FlexLayout.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 29 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 */
@@ -25,8 +25,8 @@
2525
71A5522F2CEAED47005D9FBF /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617E2ABEE4B600D5A2E0 /* YGLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
2626
71A552302CEAED47005D9FBF /* YGLayout+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617D2ABEE4B600D5A2E0 /* YGLayout+Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
2727
71A552312CEAEDC1005D9FBF /* FlexLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 24AE97351FEAF30A00995987 /* FlexLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
28-
9421472A1695AFD38FAEBD72 /* Pods_FlexLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F893AE16F96F495E91B6D58 /* Pods_FlexLayout.framework */; };
2928
EF5445402C1D607100BF4A33 /* InsetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF54453F2C1D607100BF4A33 /* InsetTests.swift */; };
29+
EFE62AEF2DF27D3F00031312 /* yoga in Frameworks */ = {isa = PBXBuildFile; productRef = EFE62AEE2DF27D3F00031312 /* yoga */; };
3030
/* End PBXBuildFile section */
3131

3232
/* Begin PBXContainerItemProxy section */
@@ -53,7 +53,6 @@
5353

5454
/* Begin PBXFileReference section */
5555
1F69C581A2C68BBBD1B64F21 /* Pods_FlexLayoutTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlexLayoutTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
56-
224171C69665A229D0A217EF /* Pods-FlexLayout.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayout.debug.xcconfig"; path = "Target Support Files/Pods-FlexLayout/Pods-FlexLayout.debug.xcconfig"; sourceTree = "<group>"; };
5756
2491CC5C1FCB931F00F3A61C /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = Carthage/Build/iOS/Nimble.framework; sourceTree = "<group>"; };
5857
2491CC5E1FCB932B00F3A61C /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quick.framework; path = Carthage/Build/iOS/Quick.framework; sourceTree = "<group>"; };
5958
24AE972E1FEAF30A00995987 /* FlexLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlexLayout.swift; sourceTree = "<group>"; };
@@ -67,8 +66,6 @@
6766
24DA37631EF843C500D1AB2F /* FlexLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlexLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6867
2B210ECFE9D7665DACB8E8A7 /* Pods-FlexLayoutTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutTests.debug.xcconfig"; path = "Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests.debug.xcconfig"; sourceTree = "<group>"; };
6968
38E690AA4AF8EDFC95DB6626 /* Pods-FlexLayoutTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutTests.release.xcconfig"; path = "Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests.release.xcconfig"; sourceTree = "<group>"; };
70-
3F893AE16F96F495E91B6D58 /* Pods_FlexLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FlexLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
71-
6B9A88E410DD5E3EA6C308DD /* Pods-FlexLayout.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayout.release.xcconfig"; path = "Target Support Files/Pods-FlexLayout/Pods-FlexLayout.release.xcconfig"; sourceTree = "<group>"; };
7269
711F2EE12ACC727000DDDD67 /* WidthSizeContentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WidthSizeContentTests.swift; sourceTree = "<group>"; };
7370
711F2EE22ACC727000DDDD67 /* PaddingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaddingTests.swift; sourceTree = "<group>"; };
7471
711F2EE32ACC727000DDDD67 /* FlexLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlexLayoutTests.swift; sourceTree = "<group>"; };
@@ -87,7 +84,7 @@
8784
isa = PBXFrameworksBuildPhase;
8885
buildActionMask = 2147483647;
8986
files = (
90-
9421472A1695AFD38FAEBD72 /* Pods_FlexLayout.framework in Frameworks */,
87+
EFE62AEF2DF27D3F00031312 /* yoga in Frameworks */,
9188
);
9289
runOnlyForDeploymentPostprocessing = 0;
9390
};
@@ -107,8 +104,6 @@
107104
children = (
108105
2B210ECFE9D7665DACB8E8A7 /* Pods-FlexLayoutTests.debug.xcconfig */,
109106
38E690AA4AF8EDFC95DB6626 /* Pods-FlexLayoutTests.release.xcconfig */,
110-
224171C69665A229D0A217EF /* Pods-FlexLayout.debug.xcconfig */,
111-
6B9A88E410DD5E3EA6C308DD /* Pods-FlexLayout.release.xcconfig */,
112107
);
113108
path = Pods;
114109
sourceTree = "<group>";
@@ -215,7 +210,6 @@
215210
2491CC5E1FCB932B00F3A61C /* Quick.framework */,
216211
2491CC5C1FCB931F00F3A61C /* Nimble.framework */,
217212
1F69C581A2C68BBBD1B64F21 /* Pods_FlexLayoutTests.framework */,
218-
3F893AE16F96F495E91B6D58 /* Pods_FlexLayout.framework */,
219213
);
220214
name = Frameworks;
221215
sourceTree = "<group>";
@@ -253,7 +247,6 @@
253247
isa = PBXNativeTarget;
254248
buildConfigurationList = 24DA376E1EF843C500D1AB2F /* Build configuration list for PBXNativeTarget "FlexLayout" */;
255249
buildPhases = (
256-
296ABF4DC2205E5C45A6CE32 /* [CP] Check Pods Manifest.lock */,
257250
24DA37551EF843C500D1AB2F /* Sources */,
258251
24DA37561EF843C500D1AB2F /* Frameworks */,
259252
24DA37571EF843C500D1AB2F /* Headers */,
@@ -276,6 +269,7 @@
276269
780CC5362B9779C60FF80C2D /* [CP] Check Pods Manifest.lock */,
277270
24DA375F1EF843C500D1AB2F /* Sources */,
278271
24DA37601EF843C500D1AB2F /* Frameworks */,
272+
9859CE1FB6801A869ABCC7F9 /* [CP] Embed Pods Frameworks */,
279273
);
280274
buildRules = (
281275
);
@@ -319,6 +313,9 @@
319313
Base,
320314
);
321315
mainGroup = 24DA37501EF843C500D1AB2F;
316+
packageReferences = (
317+
EFE62AED2DF27D3F00031312 /* XCRemoteSwiftPackageReference "yoga" */,
318+
);
322319
productRefGroup = 24DA375B1EF843C500D1AB2F /* Products */;
323320
projectDirPath = "";
324321
projectRoot = "";
@@ -340,7 +337,7 @@
340337
/* End PBXResourcesBuildPhase section */
341338

342339
/* Begin PBXShellScriptBuildPhase section */
343-
296ABF4DC2205E5C45A6CE32 /* [CP] Check Pods Manifest.lock */ = {
340+
780CC5362B9779C60FF80C2D /* [CP] Check Pods Manifest.lock */ = {
344341
isa = PBXShellScriptBuildPhase;
345342
buildActionMask = 2147483647;
346343
files = (
@@ -355,33 +352,31 @@
355352
outputFileListPaths = (
356353
);
357354
outputPaths = (
358-
"$(DERIVED_FILE_DIR)/Pods-FlexLayout-checkManifestLockResult.txt",
355+
"$(DERIVED_FILE_DIR)/Pods-FlexLayoutTests-checkManifestLockResult.txt",
359356
);
360357
runOnlyForDeploymentPostprocessing = 0;
361358
shellPath = /bin/sh;
362359
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
363360
showEnvVarsInLog = 0;
364361
};
365-
780CC5362B9779C60FF80C2D /* [CP] Check Pods Manifest.lock */ = {
362+
9859CE1FB6801A869ABCC7F9 /* [CP] Embed Pods Frameworks */ = {
366363
isa = PBXShellScriptBuildPhase;
367364
buildActionMask = 2147483647;
368365
files = (
369366
);
370-
inputFileListPaths = (
371-
);
372367
inputPaths = (
373-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
374-
"${PODS_ROOT}/Manifest.lock",
375-
);
376-
name = "[CP] Check Pods Manifest.lock";
377-
outputFileListPaths = (
368+
"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-frameworks.sh",
369+
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
370+
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
378371
);
372+
name = "[CP] Embed Pods Frameworks";
379373
outputPaths = (
380-
"$(DERIVED_FILE_DIR)/Pods-FlexLayoutTests-checkManifestLockResult.txt",
374+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
375+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
381376
);
382377
runOnlyForDeploymentPostprocessing = 0;
383378
shellPath = /bin/sh;
384-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
379+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-frameworks.sh\"\n";
385380
showEnvVarsInLog = 0;
386381
};
387382
/* End PBXShellScriptBuildPhase section */
@@ -546,7 +541,8 @@
546541
MTL_ENABLE_DEBUG_INFO = NO;
547542
SDKROOT = iphoneos;
548543
SWIFT_ACTIVE_COMPILATION_CONDITIONS = XCODE_PROJECT_BUILD;
549-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
544+
SWIFT_COMPILATION_MODE = wholemodule;
545+
SWIFT_OPTIMIZATION_LEVEL = "-O";
550546
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
551547
SWIFT_VERSION = 5.0;
552548
TARGETED_DEVICE_FAMILY = "1,2";
@@ -558,7 +554,6 @@
558554
};
559555
24DA376F1EF843C500D1AB2F /* Debug */ = {
560556
isa = XCBuildConfiguration;
561-
baseConfigurationReference = 224171C69665A229D0A217EF /* Pods-FlexLayout.debug.xcconfig */;
562557
buildSettings = {
563558
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
564559
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
@@ -574,7 +569,11 @@
574569
GENERATE_INFOPLIST_FILE = YES;
575570
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
576571
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
577-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
572+
LD_RUNPATH_SEARCH_PATHS = (
573+
"$(inherited)",
574+
"@executable_path/Frameworks",
575+
"@loader_path/Frameworks",
576+
);
578577
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayout;
579578
PRODUCT_NAME = "$(TARGET_NAME)";
580579
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -587,7 +586,6 @@
587586
};
588587
24DA37701EF843C500D1AB2F /* Release */ = {
589588
isa = XCBuildConfiguration;
590-
baseConfigurationReference = 6B9A88E410DD5E3EA6C308DD /* Pods-FlexLayout.release.xcconfig */;
591589
buildSettings = {
592590
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
593591
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
@@ -603,7 +601,11 @@
603601
GENERATE_INFOPLIST_FILE = YES;
604602
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
605603
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
606-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
604+
LD_RUNPATH_SEARCH_PATHS = (
605+
"$(inherited)",
606+
"@executable_path/Frameworks",
607+
"@loader_path/Frameworks",
608+
);
607609
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayout;
608610
PRODUCT_NAME = "$(TARGET_NAME)";
609611
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -622,7 +624,11 @@
622624
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
623625
GENERATE_INFOPLIST_FILE = YES;
624626
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
625-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
627+
LD_RUNPATH_SEARCH_PATHS = (
628+
"$(inherited)",
629+
"@executable_path/Frameworks",
630+
"@loader_path/Frameworks",
631+
);
626632
OTHER_LDFLAGS = "$(inherited)";
627633
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
628634
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -639,7 +645,11 @@
639645
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
640646
GENERATE_INFOPLIST_FILE = YES;
641647
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
642-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
648+
LD_RUNPATH_SEARCH_PATHS = (
649+
"$(inherited)",
650+
"@executable_path/Frameworks",
651+
"@loader_path/Frameworks",
652+
);
643653
OTHER_LDFLAGS = "$(inherited)";
644654
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutTests;
645655
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -678,6 +688,25 @@
678688
defaultConfigurationName = Release;
679689
};
680690
/* End XCConfigurationList section */
691+
692+
/* Begin XCRemoteSwiftPackageReference section */
693+
EFE62AED2DF27D3F00031312 /* XCRemoteSwiftPackageReference "yoga" */ = {
694+
isa = XCRemoteSwiftPackageReference;
695+
repositoryURL = "https://github.com/facebook/yoga.git";
696+
requirement = {
697+
kind = upToNextMajorVersion;
698+
minimumVersion = 3.2.1;
699+
};
700+
};
701+
/* End XCRemoteSwiftPackageReference section */
702+
703+
/* Begin XCSwiftPackageProductDependency section */
704+
EFE62AEE2DF27D3F00031312 /* yoga */ = {
705+
isa = XCSwiftPackageProductDependency;
706+
package = EFE62AED2DF27D3F00031312 /* XCRemoteSwiftPackageReference "yoga" */;
707+
productName = yoga;
708+
};
709+
/* End XCSwiftPackageProductDependency section */
681710
};
682711
rootObject = 24DA37511EF843C500D1AB2F /* Project object */;
683712
}

‎Podfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
source 'https://cdn.cocoapods.org/'
2-
use_frameworks! :linkage => :static
2+
use_frameworks!
33
platform :ios, '13.4'
44

55
workspace 'FlexLayout.xcworkspace'
66

7-
target 'FlexLayout' do
8-
pod 'Yoga'
9-
end
10-
117
target 'FlexLayoutTests' do
128
project 'FlexLayout.xcodeproj'
139
pod 'FlexLayout', path: './'

‎Podfile.lock‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ DEPENDENCIES:
99
- FlexLayout (from `./`)
1010
- PinLayout
1111
- SwiftLint
12-
- Yoga
1312

1413
SPEC REPOS:
1514
trunk:
@@ -27,6 +26,6 @@ SPEC CHECKSUMS:
2726
SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
2827
Yoga: 636ce73bd247407928a7df089f3bc3675916b3ff
2928

30-
PODFILE CHECKSUM: e95bd8fefde1bd2741249ea540133b9a4393b01f
29+
PODFILE CHECKSUM: 6ceb9d30b4e11359e45750f57ed82b7887599682
3130

3231
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)