Skip to content

Commit

Permalink
Update Swift Package Manager manifest and Dockerfile to Swift 4.0.
Browse files Browse the repository at this point in the history
Add note regarding version compatibility to the README.
  • Loading branch information
WilliamDenniss committed Nov 22, 2017
1 parent a110351 commit 7e84877
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build and test Open Location Code for Swift in Linux.
FROM swift:3.1
FROM swift:4.0
RUN mkdir /OpenLocationCode
WORKDIR /OpenLocationCode
ADD . /OpenLocationCode
Expand Down
28 changes: 22 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// swift-tools-version:4.0

//===-- OpenLocationCodeTests.swift - Tests for OpenLocationCode.swift ----===//
//
// Copyright 2017 Google Inc.
Expand All @@ -20,13 +22,27 @@
//
//===----------------------------------------------------------------------===//

// swift-tools-version:3.1

import PackageDescription

let package = Package(
let packages = Package(
name: "OpenLocationCode",
exclude: ["Framework",
"Tests/OpenLocationCodeObjCTests",
"Source/OpenLocationCodeObjCBridge.swift"]
products: [
.library(
name: "OpenLocationCode",
targets: ["OpenLocationCode"]),
],
targets: [
.target(
name: "OpenLocationCode",
path: ".",
exclude: ["Source/OpenLocationCodeObjCBridge.swift", "Framework", "Tests", "test_data"],
sources: ["Source"]
),
.testTarget(
name: "OpenLocationCodeTests",
dependencies: ["OpenLocationCode"],
path: "Tests",
exclude: ["OpenLocationCodeObjCTests"]
)
]
)
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ This library is provided as a Swift and Objective-C Cocoa Framework
for iOS, macOS, tvOS and watchOS, and as a pure Swift module
for macOS and Linux.

## Swift Versions

* Versions 1.x of Open Location Code for Swift are designed for Swift 3.2.
* Versions 2.x of Open Location Code for Swift are designed for Swift 4.0.

Choose the latest 1.x release for greater compatability, or the latest 2.x
release if you're fully in the Swift 4 world!

## Building

### Cocoa Framework
Expand Down

0 comments on commit 7e84877

Please sign in to comment.