Skip to content

Commit 8ed7f49

Browse files
lucdionlucdion
authored
Merge pull request #244 from OhKanghoon/xcframework-build-error
Fix error that occur when creating XCFramework
2 parents 16a5c07 + d10e921 commit 8ed7f49

File tree

458 files changed

+70
-182602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+70
-182602
lines changed

‎.buckconfig‎

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

‎BUCK‎

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

‎Brewfile‎

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

‎FlexLayout.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,34 @@
1313
24AE97401FEAF30A00995987 /* FlexLayout+Private.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE97311FEAF30A00995987 /* FlexLayout+Private.swift */; };
1414
24AE97411FEAF30A00995987 /* UIView+FlexLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE97321FEAF30A00995987 /* UIView+FlexLayout.swift */; };
1515
24AE97421FEAF30A00995987 /* Percent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE97331FEAF30A00995987 /* Percent.swift */; };
16-
24AE97431FEAF30A00995987 /* FlexLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 24AE97351FEAF30A00995987 /* FlexLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
1716
24AE974A1FEAF30A00995987 /* YGLayoutExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE973D1FEAF30A00995987 /* YGLayoutExtensions.swift */; };
1817
711F2EE62ACC727000DDDD67 /* AbsolutionPositionContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE02ACC727000DDDD67 /* AbsolutionPositionContentTests.swift */; };
1918
711F2EE72ACC727000DDDD67 /* WidthSizeContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE12ACC727000DDDD67 /* WidthSizeContentTests.swift */; };
2019
711F2EE82ACC727000DDDD67 /* PaddingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE22ACC727000DDDD67 /* PaddingTests.swift */; };
2120
711F2EE92ACC727000DDDD67 /* FlexLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE32ACC727000DDDD67 /* FlexLayoutTests.swift */; };
2221
711F2EEA2ACC727000DDDD67 /* MarginTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE42ACC727000DDDD67 /* MarginTests.swift */; };
2322
711F2EEB2ACC727000DDDD67 /* JustifyContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE52ACC727000DDDD67 /* JustifyContentTests.swift */; };
24-
715C61502ABEDE1900D5A2E0 /* YGFloatOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61312ABEDE1900D5A2E0 /* YGFloatOptional.h */; settings = {ATTRIBUTES = (Private, ); }; };
25-
715C61512ABEDE1900D5A2E0 /* Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61322ABEDE1900D5A2E0 /* Utils.h */; settings = {ATTRIBUTES = (Private, ); }; };
26-
715C61522ABEDE1900D5A2E0 /* CompactValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61332ABEDE1900D5A2E0 /* CompactValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
27-
715C61532ABEDE1900D5A2E0 /* Yoga-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61342ABEDE1900D5A2E0 /* Yoga-internal.h */; };
28-
715C61542ABEDE1900D5A2E0 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61352ABEDE1900D5A2E0 /* YGLayout.h */; };
23+
71332C262B794826000667C9 /* FlexLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 24AE97351FEAF30A00995987 /* FlexLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
24+
71332C272B794935000667C9 /* UIView+Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617F2ABEE4B600D5A2E0 /* UIView+Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; };
25+
71332C282B794935000667C9 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617E2ABEE4B600D5A2E0 /* YGLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
26+
71332C292B794935000667C9 /* YGLayout+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617D2ABEE4B600D5A2E0 /* YGLayout+Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
27+
71332C2A2B79493E000667C9 /* YGEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61402ABEDE1900D5A2E0 /* YGEnums.h */; settings = {ATTRIBUTES = (Public, ); }; };
28+
71332C2B2B79493E000667C9 /* YGMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61412ABEDE1900D5A2E0 /* YGMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
29+
71332C2C2B79493E000667C9 /* YGValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61432ABEDE1900D5A2E0 /* YGValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
30+
71332C2D2B79493E000667C9 /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61422ABEDE1900D5A2E0 /* Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; };
2931
715C61552ABEDE1900D5A2E0 /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C61362ABEDE1900D5A2E0 /* log.cpp */; };
3032
715C61562ABEDE1900D5A2E0 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C61372ABEDE1900D5A2E0 /* Utils.cpp */; };
3133
715C61572ABEDE1900D5A2E0 /* CMakeLists.txt in Resources */ = {isa = PBXBuildFile; fileRef = 715C61382ABEDE1900D5A2E0 /* CMakeLists.txt */; };
32-
715C61582ABEDE1900D5A2E0 /* YGNodePrint.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61392ABEDE1900D5A2E0 /* YGNodePrint.h */; settings = {ATTRIBUTES = (Private, ); }; };
3334
715C61592ABEDE1900D5A2E0 /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C613A2ABEDE1900D5A2E0 /* YGLayout.cpp */; };
34-
715C615A2ABEDE1900D5A2E0 /* YGNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C613B2ABEDE1900D5A2E0 /* YGNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
3535
715C615B2ABEDE1900D5A2E0 /* Yoga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C613C2ABEDE1900D5A2E0 /* Yoga.cpp */; };
3636
715C615C2ABEDE1900D5A2E0 /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C613D2ABEDE1900D5A2E0 /* YGStyle.cpp */; };
37-
715C615D2ABEDE1900D5A2E0 /* YGEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61402ABEDE1900D5A2E0 /* YGEnums.h */; settings = {ATTRIBUTES = (Public, ); }; };
38-
715C615E2ABEDE1900D5A2E0 /* YGMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61412ABEDE1900D5A2E0 /* YGMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
39-
715C615F2ABEDE1900D5A2E0 /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61422ABEDE1900D5A2E0 /* Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; };
40-
715C61602ABEDE1900D5A2E0 /* YGValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61432ABEDE1900D5A2E0 /* YGValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
4137
715C61612ABEDE1900D5A2E0 /* YGNodePrint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C61442ABEDE1900D5A2E0 /* YGNodePrint.cpp */; };
42-
715C61622ABEDE1900D5A2E0 /* YGStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61452ABEDE1900D5A2E0 /* YGStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
4338
715C61632ABEDE1900D5A2E0 /* YGEnums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C61462ABEDE1900D5A2E0 /* YGEnums.cpp */; };
44-
715C61642ABEDE1900D5A2E0 /* log.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61472ABEDE1900D5A2E0 /* log.h */; settings = {ATTRIBUTES = (Private, ); }; };
4539
715C61652ABEDE1900D5A2E0 /* YGValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C61482ABEDE1900D5A2E0 /* YGValue.cpp */; };
46-
715C61662ABEDE1900D5A2E0 /* BitUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C61492ABEDE1900D5A2E0 /* BitUtils.h */; settings = {ATTRIBUTES = (Private, ); }; };
47-
715C61672ABEDE1900D5A2E0 /* YGConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C614A2ABEDE1900D5A2E0 /* YGConfig.h */; settings = {ATTRIBUTES = (Private, ); }; };
4840
715C61682ABEDE1900D5A2E0 /* YGConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C614B2ABEDE1900D5A2E0 /* YGConfig.cpp */; };
4941
715C61692ABEDE1900D5A2E0 /* YGNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C614C2ABEDE1900D5A2E0 /* YGNode.cpp */; };
50-
715C616A2ABEDE1900D5A2E0 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C614E2ABEDE1900D5A2E0 /* event.h */; settings = {ATTRIBUTES = (Private, ); }; };
5142
715C616B2ABEDE1900D5A2E0 /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 715C614F2ABEDE1900D5A2E0 /* event.cpp */; };
5243
715C61812ABEE4B600D5A2E0 /* UIView+Yoga.mm in Sources */ = {isa = PBXBuildFile; fileRef = 715C617A2ABEE4B600D5A2E0 /* UIView+Yoga.mm */; };
53-
715C61822ABEE4B600D5A2E0 /* YGLayout+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617D2ABEE4B600D5A2E0 /* YGLayout+Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
54-
715C61832ABEE4B600D5A2E0 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617E2ABEE4B600D5A2E0 /* YGLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
55-
715C61842ABEE4B600D5A2E0 /* UIView+Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 715C617F2ABEE4B600D5A2E0 /* UIView+Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; };
5644
715C61852ABEE4B600D5A2E0 /* YGLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 715C61802ABEE4B600D5A2E0 /* YGLayout.mm */; };
5745
/* End PBXBuildFile section */
5846

@@ -88,7 +76,6 @@
8876
24AE97321FEAF30A00995987 /* UIView+FlexLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+FlexLayout.swift"; sourceTree = "<group>"; };
8977
24AE97331FEAF30A00995987 /* Percent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Percent.swift; sourceTree = "<group>"; };
9078
24AE97351FEAF30A00995987 /* FlexLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FlexLayout.h; sourceTree = "<group>"; };
91-
24AE97361FEAF30A00995987 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9279
24AE973D1FEAF30A00995987 /* YGLayoutExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YGLayoutExtensions.swift; sourceTree = "<group>"; };
9380
24DA375A1EF843C500D1AB2F /* FlexLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FlexLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9481
24DA37631EF843C500D1AB2F /* FlexLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlexLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -166,7 +153,6 @@
166153
24AE972D1FEAF30A00995987 /* Sources */ = {
167154
isa = PBXGroup;
168155
children = (
169-
24AE97341FEAF30A00995987 /* SupportingFiles */,
170156
B9EAD87E238884C90058E0CB /* Swift */,
171157
715C61302ABEDE1900D5A2E0 /* yoga */,
172158
715C61792ABEE4B600D5A2E0 /* YogaKit */,
@@ -184,15 +170,6 @@
184170
path = Impl;
185171
sourceTree = "<group>";
186172
};
187-
24AE97341FEAF30A00995987 /* SupportingFiles */ = {
188-
isa = PBXGroup;
189-
children = (
190-
24AE97351FEAF30A00995987 /* FlexLayout.h */,
191-
24AE97361FEAF30A00995987 /* Info.plist */,
192-
);
193-
path = SupportingFiles;
194-
sourceTree = "<group>";
195-
};
196173
24DA37501EF843C500D1AB2F = {
197174
isa = PBXGroup;
198175
children = (
@@ -321,6 +298,14 @@
321298
path = YogaKit;
322299
sourceTree = "<group>";
323300
};
301+
71CE1DE72B79E81500FD1037 /* Public */ = {
302+
isa = PBXGroup;
303+
children = (
304+
24AE97351FEAF30A00995987 /* FlexLayout.h */,
305+
);
306+
path = Public;
307+
sourceTree = "<group>";
308+
};
324309
B5403C6F81C3814B69C05D0B /* Frameworks */ = {
325310
isa = PBXGroup;
326311
children = (
@@ -334,6 +319,7 @@
334319
B9EAD87E238884C90058E0CB /* Swift */ = {
335320
isa = PBXGroup;
336321
children = (
322+
71CE1DE72B79E81500FD1037 /* Public */,
337323
24AE972E1FEAF30A00995987 /* FlexLayout.swift */,
338324
24AE972F1FEAF30A00995987 /* Impl */,
339325
24AE97331FEAF30A00995987 /* Percent.swift */,
@@ -349,26 +335,14 @@
349335
isa = PBXHeadersBuildPhase;
350336
buildActionMask = 2147483647;
351337
files = (
352-
715C615F2ABEDE1900D5A2E0 /* Yoga.h in Headers */,
353-
715C615E2ABEDE1900D5A2E0 /* YGMacros.h in Headers */,
354-
715C61832ABEE4B600D5A2E0 /* YGLayout.h in Headers */,
355-
715C61602ABEDE1900D5A2E0 /* YGValue.h in Headers */,
356-
715C61842ABEE4B600D5A2E0 /* UIView+Yoga.h in Headers */,
357-
715C615D2ABEDE1900D5A2E0 /* YGEnums.h in Headers */,
358-
715C61822ABEE4B600D5A2E0 /* YGLayout+Private.h in Headers */,
359-
715C61622ABEDE1900D5A2E0 /* YGStyle.h in Headers */,
360-
715C61672ABEDE1900D5A2E0 /* YGConfig.h in Headers */,
361-
715C61512ABEDE1900D5A2E0 /* Utils.h in Headers */,
362-
715C61582ABEDE1900D5A2E0 /* YGNodePrint.h in Headers */,
363-
715C61642ABEDE1900D5A2E0 /* log.h in Headers */,
364-
715C61662ABEDE1900D5A2E0 /* BitUtils.h in Headers */,
365-
715C61522ABEDE1900D5A2E0 /* CompactValue.h in Headers */,
366-
715C61502ABEDE1900D5A2E0 /* YGFloatOptional.h in Headers */,
367-
715C615A2ABEDE1900D5A2E0 /* YGNode.h in Headers */,
368-
715C616A2ABEDE1900D5A2E0 /* event.h in Headers */,
369-
24AE97431FEAF30A00995987 /* FlexLayout.h in Headers */,
370-
715C61542ABEDE1900D5A2E0 /* YGLayout.h in Headers */,
371-
715C61532ABEDE1900D5A2E0 /* Yoga-internal.h in Headers */,
338+
71332C262B794826000667C9 /* FlexLayout.h in Headers */,
339+
71332C272B794935000667C9 /* UIView+Yoga.h in Headers */,
340+
71332C282B794935000667C9 /* YGLayout.h in Headers */,
341+
71332C292B794935000667C9 /* YGLayout+Private.h in Headers */,
342+
71332C2A2B79493E000667C9 /* YGEnums.h in Headers */,
343+
71332C2B2B79493E000667C9 /* YGMacros.h in Headers */,
344+
71332C2C2B79493E000667C9 /* YGValue.h in Headers */,
345+
71332C2D2B79493E000667C9 /* Yoga.h in Headers */,
372346
);
373347
runOnlyForDeploymentPostprocessing = 0;
374348
};
@@ -702,17 +676,7 @@
702676
DYLIB_COMPATIBILITY_VERSION = 1;
703677
DYLIB_CURRENT_VERSION = 1;
704678
DYLIB_INSTALL_NAME_BASE = "@rpath";
705-
FRAMEWORK_SEARCH_PATHS = (
706-
"$(inherited)",
707-
"$(PROJECT_DIR)/Carthage/Build/iOS",
708-
);
709-
HEADER_SEARCH_PATHS = (
710-
"$(PROJECT_DIR)/Sources/yoga",
711-
"$(PROJECT_DIR)/Sources/yoga/include/yoga",
712-
"$(PROJECT_DIR)/Sources/YogaKit",
713-
"$(PROJECT_DIR)/Sources/YogaKit/include/YogaKit",
714-
);
715-
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
679+
GENERATE_INFOPLIST_FILE = YES;
716680
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
717681
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
718682
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayout;
@@ -737,17 +701,7 @@
737701
DYLIB_COMPATIBILITY_VERSION = 1;
738702
DYLIB_CURRENT_VERSION = 1;
739703
DYLIB_INSTALL_NAME_BASE = "@rpath";
740-
FRAMEWORK_SEARCH_PATHS = (
741-
"$(inherited)",
742-
"$(PROJECT_DIR)/Carthage/Build/iOS",
743-
);
744-
HEADER_SEARCH_PATHS = (
745-
"$(PROJECT_DIR)/Sources/yoga",
746-
"$(PROJECT_DIR)/Sources/yoga/include/yoga",
747-
"$(PROJECT_DIR)/Sources/YogaKit",
748-
"$(PROJECT_DIR)/Sources/YogaKit/include/YogaKit",
749-
);
750-
INFOPLIST_FILE = Sources/SupportingFiles/Info.plist;
704+
GENERATE_INFOPLIST_FILE = YES;
751705
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
752706
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
753707
PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayout;

‎FlexLayout.xcworkspace/contents.xcworkspacedata‎

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FlexLayout.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Gemfile.lock‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ GEM
2121
artifactory (3.0.15)
2222
atomos (0.1.3)
2323
aws-eventstream (1.3.0)
24-
aws-partitions (1.877.0)
25-
aws-sdk-core (3.190.1)
24+
aws-partitions (1.889.0)
25+
aws-sdk-core (3.191.1)
2626
aws-eventstream (~> 1, >= 1.3.0)
2727
aws-partitions (~> 1, >= 1.651.0)
2828
aws-sigv4 (~> 1.8)
2929
jmespath (~> 1, >= 1.6.1)
30-
aws-sdk-kms (1.76.0)
31-
aws-sdk-core (~> 3, >= 3.188.0)
30+
aws-sdk-kms (1.77.0)
31+
aws-sdk-core (~> 3, >= 3.191.0)
3232
aws-sigv4 (~> 1.1)
33-
aws-sdk-s3 (1.142.0)
34-
aws-sdk-core (~> 3, >= 3.189.0)
33+
aws-sdk-s3 (1.143.0)
34+
aws-sdk-core (~> 3, >= 3.191.0)
3535
aws-sdk-kms (~> 1)
3636
aws-sigv4 (~> 1.8)
3737
aws-sigv4 (1.8.0)
@@ -86,7 +86,7 @@ GEM
8686
declarative (0.0.20)
8787
digest-crc (0.6.5)
8888
rake (>= 12.0.0, < 14.0.0)
89-
domain_name (0.6.20231109)
89+
domain_name (0.6.20240107)
9090
dotenv (2.8.1)
9191
drb (2.2.0)
9292
ruby2_keywords
@@ -171,32 +171,31 @@ GEM
171171
gh_inspector (1.1.3)
172172
google-apis-androidpublisher_v3 (0.54.0)
173173
google-apis-core (>= 0.11.0, < 2.a)
174-
google-apis-core (0.11.2)
174+
google-apis-core (0.11.3)
175175
addressable (~> 2.5, >= 2.5.1)
176176
googleauth (>= 0.16.2, < 2.a)
177177
httpclient (>= 2.8.1, < 3.a)
178178
mini_mime (~> 1.0)
179179
representable (~> 3.0)
180180
retriable (>= 2.0, < 4.a)
181181
rexml
182-
webrick
183182
google-apis-iamcredentials_v1 (0.17.0)
184183
google-apis-core (>= 0.11.0, < 2.a)
185184
google-apis-playcustomapp_v1 (0.13.0)
186185
google-apis-core (>= 0.11.0, < 2.a)
187-
google-apis-storage_v1 (0.29.0)
186+
google-apis-storage_v1 (0.31.0)
188187
google-apis-core (>= 0.11.0, < 2.a)
189188
google-cloud-core (1.6.1)
190189
google-cloud-env (>= 1.0, < 3.a)
191190
google-cloud-errors (~> 1.0)
192191
google-cloud-env (1.6.0)
193192
faraday (>= 0.17.3, < 3.0)
194193
google-cloud-errors (1.3.1)
195-
google-cloud-storage (1.45.0)
194+
google-cloud-storage (1.47.0)
196195
addressable (~> 2.8)
197196
digest-crc (~> 0.4)
198197
google-apis-iamcredentials_v1 (~> 0.1)
199-
google-apis-storage_v1 (~> 0.29.0)
198+
google-apis-storage_v1 (~> 0.31.0)
200199
google-cloud-core (~> 1.6)
201200
googleauth (>= 0.16.2, < 2.a)
202201
mini_mime (~> 1.0)
@@ -220,7 +219,7 @@ GEM
220219
minitest (5.20.0)
221220
molinillo (0.8.0)
222221
multi_json (1.15.0)
223-
multipart-post (2.3.0)
222+
multipart-post (2.4.0)
224223
mutex_m (0.2.0)
225224
nanaimo (0.3.0)
226225
nap (1.1.0)
@@ -264,9 +263,8 @@ GEM
264263
concurrent-ruby (~> 1.0)
265264
uber (0.1.0)
266265
unicode-display_width (2.5.0)
267-
webrick (1.8.1)
268266
word_wrap (1.0.0)
269-
xcodeproj (1.23.0)
267+
xcodeproj (1.24.0)
270268
CFPropertyList (>= 2.3.3, < 4.0)
271269
atomos (~> 0.1.3)
272270
claide (>= 1.0.2, < 2.0)

‎Package.swift‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,27 @@ let package = Package(
1212
.target(
1313
name: "FlexLayout",
1414
dependencies: ["FlexLayoutYoga", "FlexLayoutYogaKit"],
15-
path: "Sources/Swift"
15+
path: "Sources/Swift",
16+
publicHeadersPath: "Public"
1617
),
1718
.target(
1819
name: "FlexLayoutYoga",
1920
dependencies: [],
2021
path: "Sources/yoga",
21-
publicHeadersPath: "include/yoga/",
22-
cxxSettings: [
23-
.headerSearchPath("include/yoga/"),
24-
.headerSearchPath("."),
25-
]
22+
publicHeadersPath: "include/yoga"
2623
),
2724
.target(
2825
name: "FlexLayoutYogaKit",
2926
dependencies: ["FlexLayoutYoga"],
3027
path: "Sources/YogaKit",
31-
publicHeadersPath: "include/YogaKit/",
32-
cxxSettings: [
33-
.headerSearchPath("include/YogaKit/"),
34-
.headerSearchPath("."),
35-
]
28+
publicHeadersPath: "include/YogaKit"
3629
),
3730
.testTarget(
3831
name: "FlexLayoutTests",
3932
dependencies: [
40-
"FlexLayout"
33+
"FlexLayout",
4134
]
42-
)
35+
),
4336
],
4437
cLanguageStandard: .gnu99,
4538
cxxLanguageStandard: .gnucxx11

0 commit comments

Comments
 (0)