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>
This commit is contained in:
parent
0bb0c7735e
commit
4cdc9845b4
|
@ -1,6 +1,6 @@
|
|||
defaults: &defaults
|
||||
macos:
|
||||
xcode: "11.2.1"
|
||||
xcode: "11.4.1"
|
||||
shell: /bin/bash --login -eo pipefail
|
||||
aliases:
|
||||
- &prepare
|
||||
|
|
|
@ -1 +1 @@
|
|||
ruby-2.6
|
||||
ruby-2.6.6
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
language: objective-c
|
||||
os: osx
|
||||
osx_image: xcode11.2
|
||||
osx_image: xcode11.4.1
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
|
@ -16,7 +16,6 @@ before_install:
|
|||
jobs:
|
||||
include:
|
||||
- stage: release
|
||||
if: branch = master and tag IS present
|
||||
env: Deployment
|
||||
install: bundle install
|
||||
script:
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit c791884e83916a5f986f13b83854d5a344c25da0
|
||||
Subproject commit 9398d30089c2c14e0f0026e24388ca0829f8f1c5
|
2
Gemfile
2
Gemfile
|
@ -2,7 +2,7 @@ source 'https://rubygems.org'
|
|||
|
||||
gem 'plist'
|
||||
gem 'naturally', '~> 1.3.2'
|
||||
gem 'jazzy', '~> 0.11.1'
|
||||
gem 'jazzy', '~> 0.13.3'
|
||||
gem 'cocoapods', '~> 1.8.4'
|
||||
gem 'xcpretty'
|
||||
gem 'rake'
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -7,7 +7,7 @@ GEM
|
|||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
algoliasearch (1.27.1)
|
||||
algoliasearch (1.27.2)
|
||||
httpclient (~> 2.8, >= 2.8.3)
|
||||
json (>= 1.5.1)
|
||||
atomos (0.1.3)
|
||||
|
@ -43,10 +43,10 @@ GEM
|
|||
nap
|
||||
cocoapods-search (1.0.0)
|
||||
cocoapods-stats (1.1.0)
|
||||
cocoapods-trunk (1.4.1)
|
||||
cocoapods-trunk (1.5.0)
|
||||
nap (>= 0.8, < 2.0)
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.1.0)
|
||||
cocoapods-try (1.2.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.6)
|
||||
escape (0.0.4)
|
||||
|
@ -57,7 +57,7 @@ GEM
|
|||
httpclient (2.8.3)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jazzy (0.11.2)
|
||||
jazzy (0.13.3)
|
||||
cocoapods (~> 1.5)
|
||||
mustache (~> 1.1)
|
||||
open4
|
||||
|
@ -103,7 +103,7 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
cocoapods (~> 1.8.4)
|
||||
jazzy (~> 0.11.1)
|
||||
jazzy (~> 0.13.3)
|
||||
naturally (~> 1.3.2)
|
||||
plist
|
||||
rake
|
||||
|
|
4
Rakefile
4
Rakefile
|
@ -15,8 +15,8 @@ build_folder = File.join(script_folder, 'build')
|
|||
release_folder = File.join(build_folder, 'release')
|
||||
bolts_build_folder = File.join(script_folder, 'Carthage', 'Build')
|
||||
bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-ObjC')
|
||||
ios_simulator = "\"platform=iOS Simulator,name=iPhone 11,OS=13.2.2\""
|
||||
tvos_simulator = "\"platform=tvOS Simulator,name=Apple TV 4K,OS=13.2.2\""
|
||||
ios_simulator = 'platform="iOS Simulator",name="iPhone 11"'
|
||||
tvos_simulator = 'platform="tvOS Simulator",name="Apple TV 4K"'
|
||||
|
||||
module Constants
|
||||
require 'plist'
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 62845c35f5a65f341fffbbdbcec79cf0c00b7f3b
|
||||
Subproject commit dc0ccfff8bfc62b9b87e6bcf6ee26d3e90e05509
|
Loading…
Reference in New Issue