Skip to content

Commit

Permalink
Update travis for correct Xcode 8.3 simulators.
Browse files Browse the repository at this point in the history
Update travis for correct macOS Willow target name.
Update copyright dates to 2017.
Update plist versions.
  • Loading branch information
Dave Camp authored and cnoon committed Aug 17, 2017
1 parent 2960f8a commit cf8aa96
Show file tree
Hide file tree
Showing 24 changed files with 40 additions and 33 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ env:
- LANG=en_US.UTF-8
- WORKSPACE=Willow.xcworkspace
- IOS_FRAMEWORK_SCHEME="Willow iOS"
- MACOS_FRAMEWORK_SCHEME="Willow OSX"
- MACOS_FRAMEWORK_SCHEME="Willow macOS"
- TVOS_FRAMEWORK_SCHEME="Willow tvOS"
- WATCHOS_FRAMEWORK_SCHEME="Willow watchOS"
- IOS_SDK=iphonesimulator10.2
- IOS_SDK=iphonesimulator10.3
- OSX_SDK=macosx10.12
- TVOS_SDK=appletvsimulator10.1
- WATCHOS_SDK=watchsimulator3.1
- TVOS_SDK=appletvsimulator10.2
- WATCHOS_SDK=watchsimulator3.2
- EXAMPLE_SCHEME="iOS Example"
matrix:
- DESTINATION="OS=10.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
Expand Down
15 changes: 11 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.

#### 3.x Releases

- `3.0.x` Releases - [3.0.0](#300)
- `3.0.x` Releases - [3.0.0](#300) | [3.0.1](#301)

#### 2.x Releases

Expand All @@ -23,9 +23,16 @@ All notable changes to this project will be documented in this file.

#### Updated

- Fix compile error for Swift 3.2/4.0.
- Rename Network example framework to WebServices to avoid a name collision with an iOS 11 private framework with the same name.
- Set SWIFT_VERSION to 3.2 in all targets. All targets still build with Swift 3.1/Xcode 8.3.x.
- Network example framework to WebServices to avoid a name collision with an iOS 11 private framework with the same name.
- Added by [Dave Camp](https://github.com/atomiccat) in Pull Request [#27](https://github.com/Nike-Inc/Willow/pull/27).
- SWIFT_VERSION to 3.2 in all targets. All targets still build with Swift 3.1/Xcode 8.3.x.
- Added by [Dave Camp](https://github.com/atomiccat) in Pull Request [#27](https://github.com/Nike-Inc/Willow/pull/27).
- Copyright dates to 2017.
- Added by [Dave Camp](https://github.com/atomiccat) in Pull Request [#27](https://github.com/Nike-Inc/Willow/pull/27).

#### Fixed

- Compile error for Swift 3.2/4.0.

## [3.0.0](https://github.com/Nike-Inc/Willow/releases/tag/3.0.0)

Expand Down
2 changes: 1 addition & 1 deletion Example/Frameworks/Database/Connection.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Connection.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Frameworks/Database/Database.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Database.h
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Frameworks/Database/Logger.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Logger.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Frameworks/WebServices/Logger.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Logger.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Frameworks/WebServices/Request.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Request.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/Frameworks/WebServices/WebServices.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// WebServices.h
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Example/iOS Example/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// AppDelegate.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions Example/iOS Example/ViewController.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// ViewController.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand All @@ -23,8 +23,8 @@
//

import Database
import WebServices
import UIKit
import WebServices
import Willow

class ViewController: UIViewController {
Expand Down
6 changes: 3 additions & 3 deletions Example/iOS Example/WillowConfiguration.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// WillowConfiguration.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand All @@ -24,8 +24,8 @@

import Database
import Foundation
import WebServices
import UIKit
import WebServices
import Willow

var log: Logger!
Expand Down Expand Up @@ -65,7 +65,7 @@ struct WillowConfiguration {
static func configure(
appLogLevels: LogLevel = [.debug, .info, .event],
databaseLogLevels: LogLevel = [.sql, .debug, .info, .event],
webservicesLogLevels: LogLevel = [.debug, .info, .event],
webServicesLogLevels: LogLevel = [.debug, .info, .event],
asynchronous: Bool = false)
{
let writers: [LogLevel: [LogMessageWriter]] = [.all: [ConsoleWriter()]]
Expand Down
2 changes: 1 addition & 1 deletion Source/Info-tvOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Source/LogLevel.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LogLevel.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/LogMessageModifier.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LogMessageModifier.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/LogMessageWriter.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LogMessageWriter.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/Logger.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Logger.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/LoggerConfiguration.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LoggerConfiguration.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Source/Willow.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// Willow.h
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Tests/LogLevelTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LogLevelTests.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Tests/LoggerConfigurationTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LoggerConfigurationTests.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Tests/LoggerTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// LoggerTests.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Tests/ModifierTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// ModifierTests.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion Tests/WriterTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
// WriterTests.swift
//
// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com)
// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com)
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit cf8aa96

Please sign in to comment.