Skip to content

Commit 4cdc984

Browse files
drdaznoobs2ninjas
andauthored
Removes simulator versions (#1502)
* Removes simulator versions * Fixes quotation marks * Bumps Xcode version * Updates travis Xcode version * Removing if statement and bundle install script. * Updating Ruby version to match Travis - Updated ruby versison to match travis. - Updated gemfile to fix jazzy version - Updated gemfile.lock * Adding install script back Co-authored-by: Nathan Kellert <nathankellert@gmail.com>
1 parent 0bb0c77 commit 4cdc984

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
defaults: &defaults
22
macos:
3-
xcode: "11.2.1"
3+
xcode: "11.4.1"
44
shell: /bin/bash --login -eo pipefail
55
aliases:
66
- &prepare

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.6
1+
ruby-2.6.6

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: objective-c
22
os: osx
3-
osx_image: xcode11.2
3+
osx_image: xcode11.4.1
44
branches:
55
only:
66
- master
@@ -16,7 +16,6 @@ before_install:
1616
jobs:
1717
include:
1818
- stage: release
19-
if: branch = master and tag IS present
2019
env: Deployment
2120
install: bundle install
2221
script:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
22

33
gem 'plist'
44
gem 'naturally', '~> 1.3.2'
5-
gem 'jazzy', '~> 0.11.1'
5+
gem 'jazzy', '~> 0.13.3'
66
gem 'cocoapods', '~> 1.8.4'
77
gem 'xcpretty'
88
gem 'rake'

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
algoliasearch (1.27.1)
10+
algoliasearch (1.27.2)
1111
httpclient (~> 2.8, >= 2.8.3)
1212
json (>= 1.5.1)
1313
atomos (0.1.3)
@@ -43,10 +43,10 @@ GEM
4343
nap
4444
cocoapods-search (1.0.0)
4545
cocoapods-stats (1.1.0)
46-
cocoapods-trunk (1.4.1)
46+
cocoapods-trunk (1.5.0)
4747
nap (>= 0.8, < 2.0)
4848
netrc (~> 0.11)
49-
cocoapods-try (1.1.0)
49+
cocoapods-try (1.2.0)
5050
colored2 (3.1.2)
5151
concurrent-ruby (1.1.6)
5252
escape (0.0.4)
@@ -57,7 +57,7 @@ GEM
5757
httpclient (2.8.3)
5858
i18n (0.9.5)
5959
concurrent-ruby (~> 1.0)
60-
jazzy (0.11.2)
60+
jazzy (0.13.3)
6161
cocoapods (~> 1.5)
6262
mustache (~> 1.1)
6363
open4
@@ -103,7 +103,7 @@ PLATFORMS
103103

104104
DEPENDENCIES
105105
cocoapods (~> 1.8.4)
106-
jazzy (~> 0.11.1)
106+
jazzy (~> 0.13.3)
107107
naturally (~> 1.3.2)
108108
plist
109109
rake

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ build_folder = File.join(script_folder, 'build')
1515
release_folder = File.join(build_folder, 'release')
1616
bolts_build_folder = File.join(script_folder, 'Carthage', 'Build')
1717
bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-ObjC')
18-
ios_simulator = "\"platform=iOS Simulator,name=iPhone 11,OS=13.2.2\""
19-
tvos_simulator = "\"platform=tvOS Simulator,name=Apple TV 4K,OS=13.2.2\""
18+
ios_simulator = 'platform="iOS Simulator",name="iPhone 11"'
19+
tvos_simulator = 'platform="tvOS Simulator",name="Apple TV 4K"'
2020

2121
module Constants
2222
require 'plist'

Vendor/xctoolchain

0 commit comments

Comments
 (0)