Skip to content

Commit 0742ee0

Browse files
author
Geoff MacDonald
committed
apparently carthage doesnt support xcode 12 out of box
1 parent e40e336 commit 0742ee0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: objective-c
22
rvm: 2.7.3
33
# https://docs.travis-ci.com/user/reference/osx
4-
osx_image: xcode12.2
4+
osx_image: xcode11.6
55
env:
66
global:
7-
- IOS_SIMULATOR="iPhone 11"
8-
- IOS_VERSION="14.2"
7+
- IOS_SIMULATOR="iPhone XS"
8+
- IOS_VERSION="13.6"
99
matrix:
1010
include:
1111
- env: BUILD_SCHEME="SQLite iOS"
@@ -20,7 +20,7 @@ matrix:
2020
- env: CARTHAGE_PLATFORM="tvOS"
2121
- env: PACKAGE_MANAGER_COMMAND="test"
2222
before_install:
23-
- gem install bundler
23+
- gem install bundler
2424
- gem install xcpretty --no-document
2525
- brew update
2626
- brew outdated carthage || brew upgrade carthage

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BUILD_TOOL = xcodebuild
22
BUILD_SCHEME = SQLite Mac
33
IOS_SIMULATOR = iPhone XS
4-
IOS_VERSION = 12.2
4+
IOS_VERSION = 13.6
55
ifeq ($(BUILD_SCHEME),SQLite iOS)
66
BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
77
else

Tests/Carthage/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CARTHAGE_PLATFORM := iOS
33
CARTHAGE_CONFIGURATION := Release
44
CARTHAGE_DIR := Carthage
55
CARTHAGE_ARGS := --no-use-binaries
6-
CARTHAGE_TOOLCHAIN := com.apple.dt.toolchain.Swift_3_0
6+
CARTHAGE_TOOLCHAIN := com.apple.dt.toolchain.XcodeDefault
77
CARTHAGE_CMDLINE := --configuration $(CARTHAGE_CONFIGURATION) --platform $(CARTHAGE_PLATFORM) --toolchain $(CARTHAGE_TOOLCHAIN) $(CARTHAGE_ARGS)
88

99
test: $(CARTHAGE) Cartfile

0 commit comments

Comments
 (0)