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

Add support for SPM #25

Merged
merged 1 commit into from
Jun 5, 2019
Merged

Add support for SPM #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@ workflows:
default:
jobs:
- ios-build-test
- spm

step-library:
- &prepare
run:
name: Prepare
command: |
if [ $(carthage outdated | grep -cF "latest Carthage version") -eq 0 ]; then brew update && brew upgrade carthage; fi

- &install-dependencies
run:
name: Install Dependencies
Expand All @@ -23,7 +18,7 @@ step-library:
run:
name: Build and Test for iOS
command: |
xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=12.1,name=iPhone X' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech iOS" clean build test
xcodebuild -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=12.2,name=iPhone X' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech iOS" clean build test

- &macos-build-test
run:
Expand All @@ -35,25 +30,30 @@ step-library:
run:
name: Build and Test for tvOS
command: |
xcodebuild -destination 'platform=tvOS Simulator,OS=12.1,name=Apple TV 4K (at 1080p)' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech tvOS" clean build test
xcodebuild -destination 'platform=tvOS Simulator,OS=12.2,name=Apple TV 4K (at 1080p)' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech tvOS" clean build test

- &watchos-build
run:
name: Build for watchOS
command: |
xcodebuild -destination 'platform=watchOS Simulator,OS=5.1,name=Apple Watch Series 3 - 42mm' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech watchOS" clean build
xcodebuild -destination 'platform=watchOS Simulator,OS=5.2,name=Apple Watch Series 3 - 42mm' -project MapboxSpeech.xcodeproj -scheme "MapboxSpeech watchOS" clean build

jobs:
ios-build-test:
macos:
xcode: "10.1.0"
xcode: "10.2.1"
environment:
HOMEBREW_NO_AUTO_UPDATE: 0
steps:
- checkout
- *prepare
- *install-dependencies
- *ios-build-test
- *macos-build-test
- *tvos-build-test
- *watchos-build
spm:
macos:
xcode: "10.2.1"
steps:
- checkout
- run: swift build
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
5.0
2 changes: 1 addition & 1 deletion MapboxSpeech.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ Pod::Spec.new do |s|

s.requires_arc = true
s.module_name = "MapboxSpeech"
s.swift_version = '4.0'
s.swift_version = '5.0'

end
58 changes: 26 additions & 32 deletions MapboxSpeech.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@
C54F53681F6C758C00BFCC66 /* MBSpeechOptions.swift */,
C54F53501F6C754D00BFCC66 /* Info.plist */,
);
path = MapboxSpeech;
name = MapboxSpeech;
path = Sources/MapboxSpeech;
sourceTree = "<group>";
};
C54F53591F6C754D00BFCC66 /* MapboxSpeechTests */ = {
Expand All @@ -178,7 +179,8 @@
C54F535A1F6C754D00BFCC66 /* MapboxVoiceTests.swift */,
C54F535C1F6C754D00BFCC66 /* Info.plist */,
);
path = MapboxSpeechTests;
name = MapboxSpeechTests;
path = Tests/MapboxSpeechTests;
sourceTree = "<group>";
};
C5569E671FD9E97300D9B7AC /* Frameworks */ = {
Expand All @@ -196,7 +198,8 @@
children = (
C5569E6C1FD9EEE100D9B7AC /* hello.mp3 */,
);
path = fixtures;
name = fixtures;
path = ../fixtures;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -385,10 +388,12 @@
};
DAE3527222420CE900A3FF9C = {
CreatedOnToolsVersion = 10.1;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
DAE3527A22420CEA00A3FF9C = {
CreatedOnToolsVersion = 10.1;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
DAE35295224213ED00A3FF9C = {
Expand All @@ -407,10 +412,11 @@
};
buildConfigurationList = C54F53461F6C754D00BFCC66 /* Build configuration list for PBXProject "MapboxSpeech" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = C54F53421F6C754D00BFCC66;
productRefGroup = C54F534D1F6C754D00BFCC66 /* Products */;
Expand Down Expand Up @@ -623,6 +629,7 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -679,6 +686,7 @@
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -696,15 +704,14 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 5;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeech;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -718,14 +725,13 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 5;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeech;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -740,13 +746,12 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = MapboxSpeechTests/Info.plist;
INFOPLIST_FILE = Tests/MapboxSpeechTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Mapbox.MapboxSpeechTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -761,13 +766,12 @@
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = MapboxSpeechTests/Info.plist;
INFOPLIST_FILE = Tests/MapboxSpeechTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks $(PROJECT_DIR)/Carthage/Build/iOS @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.Mapbox.MapboxSpeechTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -788,7 +792,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand All @@ -797,7 +801,6 @@
PRODUCT_NAME = MapboxSpeech;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -818,15 +821,14 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeech;
PRODUCT_NAME = MapboxSpeech;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -846,14 +848,13 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeechTests/Info.plist;
INFOPLIST_FILE = Tests/MapboxSpeechTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/Mac";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeechTests;
PRODUCT_NAME = MapboxSpeechTests;
SDKROOT = macosx;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -873,13 +874,12 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeechTests/Info.plist;
INFOPLIST_FILE = Tests/MapboxSpeechTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks $(PROJECT_DIR)/Carthage/Build/Mac";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeechTests;
PRODUCT_NAME = MapboxSpeechTests;
SDKROOT = macosx;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand All @@ -897,7 +897,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand All @@ -906,7 +906,6 @@
PRODUCT_NAME = MapboxSpeech;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -926,15 +925,14 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeech;
PRODUCT_NAME = MapboxSpeech;
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -953,14 +951,13 @@
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeechTests/Info.plist;
INFOPLIST_FILE = Tests/MapboxSpeechTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/tvOS";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeechTests;
PRODUCT_NAME = MapboxSpeechTests;
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -979,13 +976,12 @@
"$(PROJECT_DIR)/Carthage/Build/tvOS",
);
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeechTests/Info.plist;
INFOPLIST_FILE = Tests/MapboxSpeechTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/Carthage/Build/tvOS";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeechTests;
PRODUCT_NAME = MapboxSpeechTests;
SDKROOT = appletvos;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
Expand All @@ -1006,7 +1002,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand All @@ -1015,7 +1011,6 @@
PRODUCT_NAME = MapboxSpeech;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
Expand All @@ -1036,15 +1031,14 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = MapboxSpeech/Info.plist;
INFOPLIST_FILE = Sources/MapboxSpeech/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxSpeech;
PRODUCT_NAME = MapboxSpeech;
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 2.0;
};
Expand Down
Loading