Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix builds on Apple platforms #66

Merged
merged 2 commits into from
Nov 5, 2020
Merged

Fix builds on Apple platforms #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68dd9b0
Added missing file to Xcode project
1ec5 Nov 4, 2020
bc99b17
Fixed Travis configuration
1ec5 Nov 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ os:
- linux
- osx
osx_image: xcode12.2
env: SCHEME=
before_script:
- export LANG=en_US.UTF-8
- export SWIFT_VERSION=5.0
script:
- ./.travis/build.sh
matrix:
jobs:
include:
- os: osx
env: SCHEME=Polyline ACTION=test DESTINATION='platform=iOS Simulator,name=iPhone 11,OS=14.2' ONLY_ACTIVE_ARCH=NO
Expand All @@ -20,3 +21,4 @@ matrix:
env: SCHEME=PolylineWatch ACTION=build DESTINATION='platform=watchOS Simulator,name=Apple Watch Series 6 - 44mm,OS=7.1'
exclude:
- os: osx
env: SCHEME=
10 changes: 10 additions & 0 deletions Polyline.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
28DD887E1AA1280C001CC005 /* FunctionalPolylineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DD887D1AA1280C001CC005 /* FunctionalPolylineTests.swift */; };
64E1F8751A285A76002F25D3 /* Polyline.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 207F63FE19B5DF7E005261FA /* Polyline.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
91F783361CE4EB7F004E87E3 /* Polyline.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F7832C1CE4EB7E004E87E3 /* Polyline.framework */; };
DA01FB6F255361EF00335C7C /* CoreLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA01FB6E255361EF00335C7C /* CoreLocation.swift */; };
DA01FB70255361EF00335C7C /* CoreLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA01FB6E255361EF00335C7C /* CoreLocation.swift */; };
DA01FB71255361EF00335C7C /* CoreLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA01FB6E255361EF00335C7C /* CoreLocation.swift */; };
DA01FB72255361EF00335C7C /* CoreLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA01FB6E255361EF00335C7C /* CoreLocation.swift */; };
DA1A10661D003CF9009F82FA /* Polyline.h in Headers */ = {isa = PBXBuildFile; fileRef = 207F640319B5DF7E005261FA /* Polyline.h */; settings = {ATTRIBUTES = (Public, ); }; };
DA1A10691D003DFB009F82FA /* Polyline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 207F641A19B5E10C005261FA /* Polyline.swift */; };
DA1A106A1D003E56009F82FA /* PolylineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 207F640D19B5DF7E005261FA /* PolylineTests.swift */; };
Expand Down Expand Up @@ -70,6 +74,7 @@
28DD887D1AA1280C001CC005 /* FunctionalPolylineTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FunctionalPolylineTests.swift; sourceTree = "<group>"; };
91F7832C1CE4EB7E004E87E3 /* Polyline.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Polyline.framework; sourceTree = BUILT_PRODUCTS_DIR; };
91F783351CE4EB7E004E87E3 /* PolylineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PolylineTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
DA01FB6E255361EF00335C7C /* CoreLocation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreLocation.swift; sourceTree = "<group>"; };
DA1A10711D003E88009F82FA /* Polyline.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Polyline.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DA1A107A1D003E88009F82FA /* PolylineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PolylineTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
DA1A10911D00400D009F82FA /* Polyline.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Polyline.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -186,6 +191,7 @@
children = (
207F640319B5DF7E005261FA /* Polyline.h */,
207F641A19B5E10C005261FA /* Polyline.swift */,
DA01FB6E255361EF00335C7C /* CoreLocation.swift */,
35A28A5620E283F90030D1D9 /* Supporting Files */,
);
path = Polyline;
Expand Down Expand Up @@ -493,6 +499,7 @@
buildActionMask = 2147483647;
files = (
207F641B19B5E10C005261FA /* Polyline.swift in Sources */,
DA01FB6F255361EF00335C7C /* CoreLocation.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -510,6 +517,7 @@
buildActionMask = 2147483647;
files = (
DA1A10691D003DFB009F82FA /* Polyline.swift in Sources */,
DA01FB70255361EF00335C7C /* CoreLocation.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -527,6 +535,7 @@
buildActionMask = 2147483647;
files = (
DA1A10891D003EA6009F82FA /* Polyline.swift in Sources */,
DA01FB71255361EF00335C7C /* CoreLocation.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -544,6 +553,7 @@
buildActionMask = 2147483647;
files = (
DA1A109A1D004035009F82FA /* Polyline.swift in Sources */,
DA01FB72255361EF00335C7C /* CoreLocation.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down