Skip to content

Commit

Permalink
Update CI environment #trivial (matomo-org#332)
Browse files Browse the repository at this point in the history
* Updated to Xcode 11.3

* Reduced Test Fleakines

* Moved gems into Gemfile

* Updated the Cocoapods Source to use the CDN
  • Loading branch information
brototyp authored Mar 1, 2020
1 parent 884c01f commit 22b5eae
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 11 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
language: objective-c
osx_image: xcode10.3
cache: cocoapods
os: osx
osx_image: xcode11.3
cache:
bundler: true
cocoapods: true

before_install:
- 'echo ''gem: --no-document'' > ~/.gemrc'

install:
- gem install cocoapods --no-document --quiet
- gem install xcpretty --no-document --quiet
- gem install danger
- cd $TRAVIS_BUILD_DIR
- bundle install
- pod install || pod install --repo-update

script:
Expand Down
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source "https://rubygems.org"

gem "cocoapods"
gem "xcpretty"
gem "danger"
136 changes: 136 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.1)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
cocoapods (1.9.0)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.9.0)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.4.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.14.0, < 2.0)
cocoapods-core (1.9.0)
activesupport (>= 4.0.2, < 6)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.3.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.6)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.16.1)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 1.0)
git (~> 1.5)
kramdown (~> 1.5)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
escape (0.0.4)
ethon (0.12.0)
ffi (>= 1.3.0)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
ffi (1.12.2)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.6.0)
rchardet (~> 1.8)
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
json (2.3.0)
kramdown (1.17.0)
minitest (5.14.0)
molinillo (0.6.6)
multipart-post (2.1.1)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (4.16.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
public_suffix (3.1.1)
rchardet (1.8.0)
rouge (2.0.7)
ruby-macho (1.4.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)
xcodeproj (1.15.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
xcpretty (0.3.0)
rouge (~> 2.0.7)

PLATFORMS
ruby

DEPENDENCIES
cocoapods
danger
xcpretty

BUNDLED WITH
1.16.5
4 changes: 2 additions & 2 deletions MatomoTrackerTests/TrackerSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ class TrackerSpec: QuickSpec {
success()
}
trackerFixture.tracker.queue(event: EventFixture.event())
let autoTracker = AutoTracker(tracker: trackerFixture.tracker, trackingInterval: 0.1)
let autoTracker = AutoTracker(tracker: trackerFixture.tracker, trackingInterval: 0.01)
autoTracker.start()
trackerFixture.tracker.dispatchInterval = 0.1
trackerFixture.tracker.dispatchInterval = 0.01
expect(numberOfDispatches).toEventually(beGreaterThan(5))
autoTracker.stop()
}
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://github.com/CocoaPods/Specs.git'
source 'https://cdn.cocoapods.org/'

abstract_target :example do
use_frameworks!
Expand Down

0 comments on commit 22b5eae

Please sign in to comment.