Skip to content

Commit ea249bc

Browse files
committed
Use built-in sim
1 parent 943311b commit ea249bc

File tree

2 files changed

+8
-25
lines changed

2 files changed

+8
-25
lines changed

.circleci/config.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ step-library:
2020
if [ $(carthage outdated | grep -cF "latest Carthage version") -eq 0 ]; then brew update && brew upgrade carthage || true; fi
2121
echo "foo" > ~/.mapbox
2222
23-
- &publish-codecov
24-
run:
25-
name: Publish Code Coverage data
26-
command: bash <(curl -s https://codecov.io/bash)
27-
2823
jobs:
2924
build-job:
3025
parameters:
@@ -48,7 +43,7 @@ jobs:
4843
codecoverage:
4944
type: boolean
5045
default: false
51-
install_legacy_sim:
46+
add_ssh_key:
5247
type: boolean
5348
default: false
5449
macos:
@@ -60,9 +55,9 @@ jobs:
6055
- *prepare
6156
- *restore-cache
6257
- when:
63-
condition: << parameters.install_legacy_sim >>
58+
condition: << parameters.add_ssh_key >>
6459
steps:
65-
- run: xcversion simulators --install="iOS << parameters.iOS >>"
60+
- run: ssh-add -K ~/.ssh/id_rsa # Intended to get Carthage unstuck on some CI images
6661
- run:
6762
name: iOS
6863
command: |
@@ -103,8 +98,10 @@ workflows:
10398
xcode: "10.1.0"
10499
iOS: "12.1"
105100
tvOS: "12.1"
101+
add_ssh_key: true
106102
- build-job:
107-
name: "Xcode 9.4 iOS 9.3"
103+
name: "Xcode 9.4 iOS 10.3"
108104
xcode: "9.4.1"
109-
iOS: "9.3"
110-
install_legacy_sim: true
105+
iOS: "10.3.1"
106+
tvOS: "11.4"
107+
watchOS: "4.3"

MapboxDirections.xcodeproj/project.pbxproj

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,6 @@
15151515
PRODUCT_NAME = MapboxDirections;
15161516
SDKROOT = macosx;
15171517
SKIP_INSTALL = YES;
1518-
SWIFT_VERSION = 4.2;
15191518
VERSIONING_SYSTEM = "apple-generic";
15201519
VERSION_INFO_PREFIX = "";
15211520
};
@@ -1544,7 +1543,6 @@
15441543
PRODUCT_NAME = MapboxDirections;
15451544
SDKROOT = macosx;
15461545
SKIP_INSTALL = YES;
1547-
SWIFT_VERSION = 4.2;
15481546
VERSIONING_SYSTEM = "apple-generic";
15491547
VERSION_INFO_PREFIX = "";
15501548
};
@@ -1566,7 +1564,6 @@
15661564
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
15671565
PRODUCT_NAME = MapboxDirectionsTests;
15681566
SDKROOT = macosx;
1569-
SWIFT_VERSION = 4.2;
15701567
};
15711568
name = Debug;
15721569
};
@@ -1585,7 +1582,6 @@
15851582
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
15861583
PRODUCT_NAME = MapboxDirectionsTests;
15871584
SDKROOT = macosx;
1588-
SWIFT_VERSION = 4.2;
15891585
};
15901586
name = Release;
15911587
};
@@ -1612,7 +1608,6 @@
16121608
SDKROOT = appletvos;
16131609
SKIP_INSTALL = YES;
16141610
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1615-
SWIFT_VERSION = 4.0;
16161611
TARGETED_DEVICE_FAMILY = 3;
16171612
TVOS_DEPLOYMENT_TARGET = 9.0;
16181613
VERSIONING_SYSTEM = "apple-generic";
@@ -1642,7 +1637,6 @@
16421637
SDKROOT = appletvos;
16431638
SKIP_INSTALL = YES;
16441639
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1645-
SWIFT_VERSION = 4.0;
16461640
TARGETED_DEVICE_FAMILY = 3;
16471641
TVOS_DEPLOYMENT_TARGET = 9.0;
16481642
VERSIONING_SYSTEM = "apple-generic";
@@ -1665,7 +1659,6 @@
16651659
PRODUCT_NAME = MapboxDirectionsTests;
16661660
SDKROOT = appletvos;
16671661
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1668-
SWIFT_VERSION = 4.0;
16691662
TVOS_DEPLOYMENT_TARGET = 9.0;
16701663
};
16711664
name = Debug;
@@ -1684,7 +1677,6 @@
16841677
PRODUCT_NAME = MapboxDirectionsTests;
16851678
SDKROOT = appletvos;
16861679
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1687-
SWIFT_VERSION = 4.0;
16881680
TVOS_DEPLOYMENT_TARGET = 9.0;
16891681
};
16901682
name = Release;
@@ -1713,7 +1705,6 @@
17131705
SDKROOT = watchos;
17141706
SKIP_INSTALL = YES;
17151707
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1716-
SWIFT_VERSION = 4.0;
17171708
TARGETED_DEVICE_FAMILY = 4;
17181709
VERSIONING_SYSTEM = "apple-generic";
17191710
VERSION_INFO_PREFIX = "";
@@ -1744,7 +1735,6 @@
17441735
SDKROOT = watchos;
17451736
SKIP_INSTALL = YES;
17461737
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1747-
SWIFT_VERSION = 4.0;
17481738
TARGETED_DEVICE_FAMILY = 4;
17491739
VERSIONING_SYSTEM = "apple-generic";
17501740
VERSION_INFO_PREFIX = "";
@@ -1775,7 +1765,6 @@
17751765
PRODUCT_NAME = "$(TARGET_NAME)";
17761766
SKIP_INSTALL = YES;
17771767
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1778-
SWIFT_VERSION = 4.0;
17791768
VERSIONING_SYSTEM = "apple-generic";
17801769
VERSION_INFO_PREFIX = "";
17811770
};
@@ -1803,7 +1792,6 @@
18031792
PRODUCT_NAME = "$(TARGET_NAME)";
18041793
SKIP_INSTALL = YES;
18051794
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
1806-
SWIFT_VERSION = 4.0;
18071795
VERSIONING_SYSTEM = "apple-generic";
18081796
VERSION_INFO_PREFIX = "";
18091797
};
@@ -1823,7 +1811,6 @@
18231811
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(PROJECT_DIR)/Carthage/Build/iOS @executable_path/Frameworks @loader_path/Frameworks";
18241812
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
18251813
PRODUCT_NAME = "$(TARGET_NAME)";
1826-
SWIFT_VERSION = 5.0;
18271814
};
18281815
name = Debug;
18291816
};
@@ -1840,7 +1827,6 @@
18401827
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(PROJECT_DIR)/Carthage/Build/iOS @executable_path/Frameworks @loader_path/Frameworks";
18411828
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
18421829
PRODUCT_NAME = "$(TARGET_NAME)";
1843-
SWIFT_VERSION = 5.0;
18441830
};
18451831
name = Release;
18461832
};

0 commit comments

Comments
 (0)