Skip to content

Commit e74ee7a

Browse files
stevebrambillastevebrambilla
committed
Merge remote-tracking branch 'origin/swift-5.1'
2 parents 117d080 + 32a11c9 commit e74ee7a

File tree

75 files changed

+3269
-2129
lines changed

Some content is hidden

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

75 files changed

+3269
-2129
lines changed

‎.gitignore‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Xcode
2+
#
3+
# See also: https://github.com/github/gitignore/blob/master/Swift.gitignore
4+
5+
## Build generated
6+
build/
7+
DerivedData/
8+
9+
## Various settings
10+
*.pbxuser
11+
!default.pbxuser
12+
*.mode1v3
13+
!default.mode1v3
14+
*.mode2v3
15+
!default.mode2v3
16+
*.perspectivev3
17+
!default.perspectivev3
18+
xcuserdata/
19+
20+
## Other
21+
*.moved-aside
22+
*.xccheckout
23+
*.xcscmblueprint
24+
25+
## Obj-C/Swift specific
26+
*.hmap
27+
*.ipa
28+
*.dSYM.zip
29+
*.dSYM
30+
31+
# Swift Package Manager
32+
#
33+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
34+
# Packages/
35+
# Package.pins
36+
# Package.resolved
37+
.build/
38+
.swiftpm

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: objective-c
2-
osx_image: xcode10.2
1+
language: swift
2+
osx_image: xcode11
33
script:
44
- ./script/cibuild

‎LayoutExpressions.xcodeproj/project.pbxproj‎

Lines changed: 639 additions & 272 deletions
Large diffs are not rendered by default.

‎LayoutExpressions.xcodeproj/xcshareddata/xcschemes/LayoutExpressions-iOS.xcscheme‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
</BuildableReference>
4040
</TestableReference>
4141
</Testables>
42-
<AdditionalOptions>
43-
</AdditionalOptions>
4442
</TestAction>
4543
<LaunchAction
4644
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:LayoutExpressions.xcodeproj">
6260
</BuildableReference>
6361
</MacroExpansion>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎LayoutExpressions.xcodeproj/xcshareddata/xcschemes/LayoutExpressions-macOS.xcscheme‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1100"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "AA7597B122CA68570060C5A1"
18+
BuildableName = "LayoutExpressions.framework"
19+
BlueprintName = "LayoutExpressions-macOS"
20+
ReferencedContainer = "container:LayoutExpressions.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "AA7597D422CA6D320060C5A1"
36+
BuildableName = "LayoutExpressionsTests-macOS.xctest"
37+
BlueprintName = "LayoutExpressionsTests-macOS"
38+
ReferencedContainer = "container:LayoutExpressions.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "Debug"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "YES"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "AA7597B122CA68570060C5A1"
64+
BuildableName = "LayoutExpressions.framework"
65+
BlueprintName = "LayoutExpressions-macOS"
66+
ReferencedContainer = "container:LayoutExpressions.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎LayoutExpressions/AVPlayerViewController+Anchors.swift‎

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

‎LayoutExpressions/Constraints.swift‎

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

‎LayoutExpressions/EdgesExpression.swift‎

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

0 commit comments

Comments
 (0)