Skip to content

Commit 1e0e8f3

Browse files
Merge branch 'stable' to master
# Conflicts: # Iterable-iOS-AppExtensions.podspec # Iterable-iOS-SDK.podspec # swift-sdk/IterableAPI.swift
2 parents ade8867 + 394d8a9 commit 1e0e8f3

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
osx_image: xcode10
1+
osx_image: xcode10.2
22
language: swift
33

44
before_install:
55
- gem install xcpretty xcpretty-travis-formatter
66

77
script:
8-
- xcodebuild test -workspace swift-sdk.xcworkspace -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone X' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -f `xcpretty-travis-formatter`
8+
- xcodebuild test -workspace swift-sdk.xcworkspace -scheme swift-sdk -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone Xs' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -f `xcpretty-travis-formatter`
99
- bash <(curl -s https://codecov.io/bash)
1010
- xcodebuild test -workspace swift-sdk.xcworkspace -scheme ios9-tests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.0' -enableCodeCoverage YES CODE_SIGNING_REQUIRED=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -f `xcpretty-travis-formatter`
1111
- bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [6.0.8](https://github.com/Iterable/swift-sdk/releases/tag/6.0.8)
6+
#### Fixed
7+
- Carthage support with Xcode 10.2
8+
59
## [6.0.7](https://github.com/Iterable/swift-sdk/releases/tag/6.0.7)
610
#### Fixed
711
- XCode 10.2 Warnings

swift-sdk.xcodeproj/xcshareddata/xcschemes/ios9-tests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
buildForTesting = "YES"
3939
buildForRunning = "YES"
4040
buildForProfiling = "YES"
41-
buildForArchiving = "YES"
41+
buildForArchiving = "NO"
4242
buildForAnalyzing = "NO">
4343
<BuildableReference
4444
BuildableIdentifier = "primary"

swift-sdk.xcodeproj/xcshareddata/xcschemes/swift-sdk.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
buildForTesting = "YES"
3939
buildForRunning = "YES"
4040
buildForProfiling = "YES"
41-
buildForArchiving = "YES"
41+
buildForArchiving = "NO"
4242
buildForAnalyzing = "NO">
4343
<BuildableReference
4444
BuildableIdentifier = "primary"

0 commit comments

Comments
 (0)