Skip to content

Commit 4d4aba0

Browse files
author
Alex Usbergo
committed
Adds Swift 4.2 compatibility
1 parent a13f746 commit 4d4aba0

File tree

32 files changed

+596
-114
lines changed

32 files changed

+596
-114
lines changed

‎Render.xcodeproj/project.pbxproj

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

99
/* Begin PBXBuildFile section */
10-
16253DD520C9A7F400E34D51 /* BackwardsCompatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16253DD420C9A7F400E34D51 /* BackwardsCompatibility.swift */; };
1110
BF_100451147478 /* YamlBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_311136529580 /* YamlBridge.swift */; };
1211
BF_111358888711 /* YGPercentLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_584536161622 /* YGPercentLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
1312
BF_114241843021 /* NavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_341471119220 /* NavigationBar.swift */; };
1413
BF_119195089178 /* RenderNeutrino.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FR_699701780932 /* RenderNeutrino.framework */; };
1514
BF_130318008309 /* UIView+Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_594577632133 /* UIView+Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; };
16-
BF_145689485922 /* RenderNeutrino-Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_155113108316 /* RenderNeutrino-Swift.h */; settings = {ATTRIBUTES = (Public, ); }; };
1715
BF_159706317339 /* KeyPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_108333899125 /* KeyPath.swift */; };
1816
BF_162887300272 /* Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_285540450273 /* Context.swift */; };
1917
BF_209873044719 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_874814771617 /* State.swift */; };
@@ -36,9 +34,12 @@
3634
BF_557116620637 /* TableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_407264690487 /* TableViewController.swift */; };
3735
BF_578438420187 /* ContextTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_371490353764 /* ContextTests.swift */; };
3836
BF_579381017942 /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_275342356738 /* Yoga.h */; settings = {ATTRIBUTES = (Public, ); }; };
37+
BF_579407411024 = {isa = PBXBuildFile; fileRef = FR_479945003232 /* Test.xctest */; };
38+
BF_592562283138 = {isa = PBXBuildFile; fileRef = FR_699701780932 /* RenderNeutrino.framework */; };
3939
BF_594884445968 /* YGPercentLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = "FR_584536161622-1" /* YGPercentLayout.m */; };
4040
BF_600094276189 /* UIView+Yoga.m in Sources */ = {isa = PBXBuildFile; fileRef = FR_594577630522 /* UIView+Yoga.m */; };
4141
BF_606331023895 /* ViewControllerTransitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_578786004173 /* ViewControllerTransitions.swift */; };
42+
BF_634094137492 /* BackwardsCompatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_447415629330 /* BackwardsCompatibility.swift */; };
4243
BF_669968029346 /* YGLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = FR_873857240235 /* YGLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
4344
BF_676515190407 /* YGExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = FR_863461519028 /* YGExtensions.swift */; };
4445
BF_678875975098 /* YGLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = FR_873857240571 /* YGLayout.m */; };
@@ -65,27 +66,26 @@
6566
/* End PBXContainerItemProxy section */
6667

6768
/* Begin PBXFileReference section */
68-
16253DD420C9A7F400E34D51 /* BackwardsCompatibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackwardsCompatibility.swift; sourceTree = "<group>"; };
6969
FR_108333899125 /* KeyPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyPath.swift; sourceTree = "<group>"; };
70-
FR_155113108316 /* RenderNeutrino-Swift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RenderNeutrino-Swift.h"; sourceTree = "<group>"; };
7170
FR_158534509235 /* YGLayout+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YGLayout+Private.h"; sourceTree = "<group>"; };
7271
FR_186172487891 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
7372
FR_252848279705 /* Stylesheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stylesheet.swift; sourceTree = "<group>"; };
74-
FR_275342356736 /* Yoga.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Yoga.c; sourceTree = "<group>"; };
73+
FR_275342356736 /* Yoga.c */ = {isa = PBXFileReference; path = Yoga.c; sourceTree = "<group>"; };
7574
FR_275342356738 /* Yoga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Yoga.h; sourceTree = "<group>"; };
7675
FR_281829024519 /* IGListCollectionViewLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IGListCollectionViewLayout.h; sourceTree = "<group>"; };
7776
FR_285540450273 /* Context.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Context.swift; sourceTree = "<group>"; };
78-
FR_286350938122 /* YGEnums.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = YGEnums.c; sourceTree = "<group>"; };
77+
FR_286350938122 /* YGEnums.c */ = {isa = PBXFileReference; path = YGEnums.c; sourceTree = "<group>"; };
7978
FR_286350938182 /* YGEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGEnums.h; sourceTree = "<group>"; };
8079
FR_311136529580 /* YamlBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YamlBridge.swift; sourceTree = "<group>"; };
81-
FR_312648333574 /* YGNodeList.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = YGNodeList.c; sourceTree = "<group>"; };
80+
FR_312648333574 /* YGNodeList.c */ = {isa = PBXFileReference; path = YGNodeList.c; sourceTree = "<group>"; };
8281
FR_312648333735 /* YGNodeList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGNodeList.h; sourceTree = "<group>"; };
8382
FR_341471119220 /* NavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBar.swift; sourceTree = "<group>"; };
8483
FR_356489276377 /* Inspector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Inspector.swift; sourceTree = "<group>"; };
8584
FR_371490353764 /* ContextTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextTests.swift; sourceTree = "<group>"; };
8685
FR_375489759311 /* YGMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGMacros.h; sourceTree = "<group>"; };
8786
FR_407264690487 /* TableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TableViewController.swift; sourceTree = "<group>"; };
88-
FR_473753437359 /* IGListCollectionViewLayout.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = IGListCollectionViewLayout.mm; sourceTree = "<group>"; };
87+
FR_447415629330 /* BackwardsCompatibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackwardsCompatibility.swift; sourceTree = "<group>"; };
88+
FR_473753437359 /* IGListCollectionViewLayout.mm */ = {isa = PBXFileReference; path = IGListCollectionViewLayout.mm; sourceTree = "<group>"; };
8989
FR_479945003232 /* Test.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = Test.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
9090
FR_493811752375 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9191
FR_496796634774 /* Component.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Component.swift; sourceTree = "<group>"; };
@@ -101,7 +101,7 @@
101101
FR_621473682166 /* RenderNeutrino.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderNeutrino.h; sourceTree = "<group>"; };
102102
FR_631122443326 /* StylesheetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StylesheetTests.swift; sourceTree = "<group>"; };
103103
FR_655237554988 /* Node.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Node.swift; sourceTree = "<group>"; };
104-
FR_659407974422 /* yaml.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = yaml.c; sourceTree = "<group>"; };
104+
FR_659407974422 /* yaml.c */ = {isa = PBXFileReference; path = yaml.c; sourceTree = "<group>"; };
105105
"FR_659407974422-1" /* yaml.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = yaml.h; sourceTree = "<group>"; };
106106
FR_699701780932 /* RenderNeutrino.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RenderNeutrino.framework; sourceTree = BUILT_PRODUCTS_DIR; };
107107
FR_710837021641 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
@@ -191,7 +191,6 @@
191191
G_7194754941508 /* mods */,
192192
G_4105162032161 /* src */,
193193
FR_525521535926 /* Info.plist */,
194-
FR_155113108316 /* RenderNeutrino-Swift.h */,
195194
FR_621473682166 /* RenderNeutrino.h */,
196195
);
197196
path = render;
@@ -234,7 +233,7 @@
234233
isa = PBXGroup;
235234
children = (
236235
G_6893859073568 /* yoga */,
237-
16253DD420C9A7F400E34D51 /* BackwardsCompatibility.swift */,
236+
FR_447415629330 /* BackwardsCompatibility.swift */,
238237
);
239238
path = deps;
240239
sourceTree = "<group>";
@@ -295,7 +294,6 @@
295294
buildActionMask = 2147483647;
296295
files = (
297296
BF_462836686627 /* IGListCollectionViewLayout.h in Headers */,
298-
BF_145689485922 /* RenderNeutrino-Swift.h in Headers */,
299297
BF_555278485876 /* RenderNeutrino.h in Headers */,
300298
BF_130318008309 /* UIView+Yoga.h in Headers */,
301299
BF_703901964368 /* YGEnums.h in Headers */,
@@ -358,9 +356,6 @@
358356
compatibilityVersion = "Xcode 3.2";
359357
developmentRegion = en;
360358
hasScannedForEncodings = 0;
361-
knownRegions = (
362-
en,
363-
);
364359
mainGroup = G_8448771205358;
365360
projectDirPath = "";
366361
projectRoot = "";
@@ -404,14 +399,14 @@
404399
isa = PBXSourcesBuildPhase;
405400
buildActionMask = 2147483647;
406401
files = (
402+
BF_634094137492 /* BackwardsCompatibility.swift in Sources */,
407403
BF_893319261635 /* BaseViewController.swift in Sources */,
408404
BF_785158064595 /* Component.swift in Sources */,
409405
BF_162887300272 /* Context.swift in Sources */,
410406
BF_535091931511 /* Debug.swift in Sources */,
411407
BF_784257326017 /* Expression.swift in Sources */,
412408
BF_354030057635 /* Geometry.swift in Sources */,
413409
BF_398648952227 /* IGListCollectionViewLayout.mm in Sources */,
414-
16253DD520C9A7F400E34D51 /* BackwardsCompatibility.swift in Sources */,
415410
BF_363282377240 /* Inspector.swift in Sources */,
416411
BF_159706317339 /* KeyPath.swift in Sources */,
417412
BF_114241843021 /* NavigationBar.swift in Sources */,
@@ -468,8 +463,8 @@
468463
SDKROOT = iphoneos;
469464
SKIP_INSTALL = YES;
470465
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
466+
SWIFT_VERSION = 4.2;
471467
TARGETED_DEVICE_FAMILY = "1,2";
472-
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
473468
VERSIONING_SYSTEM = "apple-generic";
474469
};
475470
name = Debug;
@@ -566,8 +561,8 @@
566561
SDKROOT = iphoneos;
567562
SKIP_INSTALL = YES;
568563
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
564+
SWIFT_VERSION = 4.2;
569565
TARGETED_DEVICE_FAMILY = "1,2";
570-
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
571566
VERSIONING_SYSTEM = "apple-generic";
572567
};
573568
name = Release;

‎bin/RenderInspector.framework.dSYM/Contents/Resources/DWARF/RenderInspector

2.53 MB
Binary file not shown.

‎bin/RenderInspector.framework/Info.plist

30 Bytes
Binary file not shown.

‎bin/RenderInspector.framework/RenderInspector

1.28 MB
Binary file not shown.

‎bin/RenderInspector.framework/_CodeSignature/CodeResources

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</data>
1515
<key>Info.plist</key>
1616
<data>
17-
hKNa7HESnjOKEyWocTHKLauQkTw=
17+
a81TflpLeXcOGb8YyZ6QDB98chg=
1818
</data>
1919
<key>Modules/RenderInspector.swiftmodule/i386.swiftdoc</key>
2020
<data>

‎bin/RenderNeutrino.framework.dSYM/Contents/Resources/DWARF/RenderNeutrino

-27 KB
Binary file not shown.

0 commit comments

Comments
 (0)