From e17d1d05c08796536dea0b36a38b9c2bbde0fb06 Mon Sep 17 00:00:00 2001 From: Fredrik Karlsson Date: Mon, 25 Sep 2017 20:20:55 +0200 Subject: [PATCH] Reuse plist from iOS --- README.md | 3 ++- Turf copy-Info.plist | 24 ------------------------ Turf.xcodeproj/project.pbxproj | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 Turf copy-Info.plist diff --git a/README.md b/README.md index b7042d74..22cffc2b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ **Warning:** The Turf-swift API is **experimental** and will change. It is published to be able to get feedback from the community. Please use with caution and open issues for any problems you see or missing features that should be added. -[![](https://www.bitrise.io/app/49f5bcca71bf6c8d/status.svg?token=SzGBTkEtxsbuAnbcF9MTog&branch=master)](https://www.bitrise.io/app/49f5bcca71bf6c8d) +📱[![](https://www.bitrise.io/app/49f5bcca71bf6c8d/status.svg?token=SzGBTkEtxsbuAnbcF9MTog&branch=master)](https://www.bitrise.io/app/49f5bcca71bf6c8d) +🖥💻[![](https://www.bitrise.io/app/b72273651db53613/status.svg?token=ODv2UnyAHoOxV8APATEBFw&branch=master)](https://www.bitrise.io/app/b72273651db53613) A Swift language port of [Turf.js](http://turfjs.org). diff --git a/Turf copy-Info.plist b/Turf copy-Info.plist deleted file mode 100644 index 1007fd9d..00000000 --- a/Turf copy-Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/Turf.xcodeproj/project.pbxproj b/Turf.xcodeproj/project.pbxproj index c5b89d12..367ed7ec 100644 --- a/Turf.xcodeproj/project.pbxproj +++ b/Turf.xcodeproj/project.pbxproj @@ -18,6 +18,9 @@ 356D24541F17948C003BBB9D /* CoreLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D24531F17948C003BBB9D /* CoreLocation.swift */; }; 356D24561F179B32003BBB9D /* Fixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D24551F179B32003BBB9D /* Fixture.swift */; }; 356D24591F179B72003BBB9D /* dc-line.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 356D24581F179B72003BBB9D /* dc-line.geojson */; }; + 35CB7F6D1F79899C008A18C8 /* TurfTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35650AFE1F150DC500B5C158 /* TurfTests.swift */; }; + 35CB7F6E1F798A4B008A18C8 /* Fixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 356D24551F179B32003BBB9D /* Fixture.swift */; }; + 35CB7F6F1F798A51008A18C8 /* dc-line.geojson in Resources */ = {isa = PBXBuildFile; fileRef = 356D24581F179B72003BBB9D /* dc-line.geojson */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -92,7 +95,6 @@ 35650AF21F150DC500B5C158 /* Turf */, 35650AFD1F150DC500B5C158 /* TurfTests */, 35650AF11F150DC500B5C158 /* Products */, - 353E9B011F3E08BD007CFA23 /* Turf copy-Info.plist */, ); sourceTree = ""; }; @@ -288,6 +290,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 35CB7F6F1F798A51008A18C8 /* dc-line.geojson in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -322,6 +325,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 35CB7F6D1F79899C008A18C8 /* TurfTests.swift in Sources */, + 35CB7F6E1F798A4B008A18C8 /* Fixture.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -379,7 +384,7 @@ PRODUCT_NAME = Turf; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -403,7 +408,7 @@ PRODUCT_NAME = Turf; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; }; name = Release; }; @@ -415,13 +420,13 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = TurfMacTests/Info.plist; + INFOPLIST_FILE = TurfTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.TurfMacTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -433,13 +438,13 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = TurfMacTests/Info.plist; + INFOPLIST_FILE = TurfTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.TurfMacTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 3.0; }; name = Release; };