Skip to content

Commit

Permalink
Support Swift 5 (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
djones6 authored Nov 27, 2018
1 parent 58524ef commit 5ad546a
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 59 deletions.
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ branches:
# by .swift-version, unless SWIFT_SNAPSHOT is specified.
matrix:
include:
- os: linux
dist: trusty
sudo: required
env: SWIFT_SNAPSHOT=3.1.1
- os: linux
dist: trusty
sudo: required
Expand All @@ -35,11 +31,12 @@ matrix:
dist: trusty
sudo: required
services: docker
env: DOCKER_IMAGE=ubuntu:18.04
- os: osx
osx_image: xcode8.3
env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
- os: linux
dist: trusty
sudo: required
env: SWIFT_SNAPSHOT=3.1.1
services: docker
env: DOCKER_IMAGE=ubuntu:18.04
- os: osx
osx_image: xcode9.2
sudo: required
Expand All @@ -51,6 +48,10 @@ matrix:
- os: osx
osx_image: xcode10
sudo: required
- os: osx
osx_image: xcode10.1
sudo: required
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT

before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git
Expand Down
5 changes: 0 additions & 5 deletions Package.pins

This file was deleted.

24 changes: 22 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// swift-tools-version:4.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

/**
* Copyright IBM Corporation 2016, 2017
* Copyright IBM Corporation 2016, 2018
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,7 +21,24 @@ import PackageDescription

let package = Package(
name: "HeliumLogger",
products: [
// Products define the executables and libraries produced by a package, and make them visible to other packages.
.library(
name: "HeliumLogger",
targets: ["HeliumLogger"]
)
],
dependencies: [
.Package(url: "https://github.com/IBM-Swift/LoggerAPI.git", majorVersion: 1, minor: 7),
.package(url: "https://github.com/IBM-Swift/LoggerAPI.git", from: "1.7.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "HeliumLogger",
dependencies: ["LoggerAPI"]),
.testTarget(
name: "HeliumLoggerTests",
dependencies: ["HeliumLogger"])
]
)
44 changes: 0 additions & 44 deletions [email protected]

This file was deleted.

0 comments on commit 5ad546a

Please sign in to comment.