Skip to content

Commit

Permalink
Replaced CocoaPods with Carthage
Browse files Browse the repository at this point in the history
  • Loading branch information
1ec5 committed Feb 21, 2017
1 parent 405158e commit a597a5c
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 254 deletions.
5 changes: 2 additions & 3 deletions .gitignore
@@ -1,5 +1,3 @@
MapboxStatic.xcworkspace

.DS_Store

xcuserdata
Expand All @@ -8,4 +6,5 @@ xcuserdata
*.xcuserstate
*.xcscmblueprint

Pods/
Carthage/Build
Carthage/Checkouts
1 change: 1 addition & 0 deletions Cartfile.private
@@ -0,0 +1 @@
github "AliSoftware/OHHTTPStubs" "swift-3.0"
1 change: 1 addition & 0 deletions Cartfile.resolved
@@ -0,0 +1 @@
github "AliSoftware/OHHTTPStubs" "57feceaabf333e72b2c637dfba6c13a7a5c49619"
249 changes: 59 additions & 190 deletions MapboxStatic.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Expand Up @@ -26,7 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand Down
Expand Up @@ -26,7 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
</Testables>
<AdditionalOptions>
Expand Down
27 changes: 0 additions & 27 deletions Podfile

This file was deleted.

14 changes: 0 additions & 14 deletions Podfile.lock

This file was deleted.

32 changes: 14 additions & 18 deletions README.md
Expand Up @@ -13,22 +13,24 @@ MapboxStatic.swift pairs well with [MapboxDirections.swift](https://github.com/m

## Installation

Embed `MapboxStatic.framework` into your application target, then `import MapboxStatic` or `@import MapboxStatic;`.
Specify the following dependency in your [Carthage](https://github.com/Carthage/Carthage/) Cartfile:

Alternatively, specify the following dependency in your [CocoaPods](http://cocoapods.org/) Podfile:
```sh
github "Mapbox/MapboxStatic.swift" "master"
```

Or in your [CocoaPods](http://cocoapods.org/) Podfile:

```podspec
pod 'MapboxStatic.swift', :git => 'https://github.com/mapbox/MapboxStatic.swift.git', :branch => 'master'
```

Or in your [Carthage](https://github.com/Carthage/Carthage) Cartfile:

```sh
github "Mapbox/MapboxStatic.swift" "master"
```
Then `import MapboxStatic` or `@import MapboxStatic;`.

v0.6.2 is the last release of MapboxDirections.swift written in Swift 2.3. The `swift2.3` branch corresponds to this release, plus any critical bug fixes that have been applied since. All subsequent releases will be based on the `master` branch, which is written in Swift 3. The Swift examples below are written in Swift 3; see the `swift2.3` branch’s readme for Swift 2.3 examples.

This repository includes an example iOS application written in Swift, as well as Swift playgrounds for iOS and macOS. To run them, you need to use [Carthage](https://github.com/Carthage/Carthage) 0.19 or above to install the dependencies. Open the playgrounds inside of MapboxStatic.xcworkspace. More examples are available in the [Mapbox API Documentation](https://www.mapbox.com/api-documentation/?language=Swift#static-classic).

## Usage

You will need a [map ID](https://www.mapbox.com/help/define-map-id/) from a [custom map style](https://www.mapbox.com/help/customizing-the-map/) on your Mapbox account. You will also need an [access token](https://www.mapbox.com/developers/api/#access-tokens) in order to use the API.
Expand Down Expand Up @@ -294,16 +296,10 @@ When creating a map, you can also specify PNG or JPEG image format as well as va
Be sure to [attribute your map](https://www.mapbox.com/help/attribution/) properly in your application. You can also [find out more](https://www.mapbox.com/about/maps/) about where Mapbox’s map data comes from.
### Tests
To run the included unit tests, you need to use [CocoaPods](http://cocoapods.org) to install the dependencies.
1. `pod install`
1. `open MapboxStatic.xcworkspace`
1. `Command+U` or `xcodebuild test`
The workspace requires CocoaPods 1.2 or greater if opening inside Xcode 8.
## Tests
### More info
To run the included unit tests, you need to use [Carthage](https://github.com/Carthage/Carthage) 0.19 or above to install the dependencies.
This repository includes an example iOS application written in Swift, as well as Swift playgrounds for iOS and macOS. (Open the playgrounds inside of MapboxStatic.xcworkspace.) More examples are available in the [Mapbox API Documentation](https://www.mapbox.com/api-documentation/?language=Swift#static-classic).
1. `carthage bootstrap`
1. `open MapboxStatic.xcodeproj`
1. Go to Product ‣ Test.

0 comments on commit a597a5c

Please sign in to comment.