Skip to content

Commit

Permalink
Try to fix up CI (#987)
Browse files Browse the repository at this point in the history
* Update fastlane and danger

* Update to Xcode 9.4

* Remove Danger

* Fix up header search paths

* Lock Kanna version
  • Loading branch information
dlackty authored and ifeherva committed Jul 22, 2018
1 parent e13965a commit 0053bc0
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 122 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
@@ -1,8 +1,5 @@
language: objective-c
osx_image: xcode9.3

before_script:
- bundle exec danger
osx_image: xcode9.4

cache:
bundler: true
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
@@ -1,6 +1,6 @@
github "bitstadium/HockeySDK-Mac" "5.0.0"
github "jwilling/JNWCollectionView" "master"
github "tid-kijyun/Kanna" "feature/v4.0.0"
github "tid-kijyun/Kanna" ~> 4.0.0
github "shpakovski/MASPreferences" "master"
github "sparkle-project/Sparkle" "master"
github "delba/TextAttributes"
Expand Down
6 changes: 3 additions & 3 deletions Cartfile.resolved
Expand Up @@ -5,14 +5,14 @@ github "JohnSundell/Wrap" "3.0.1"
github "SwiftyBeaver/SwiftyBeaver" "1.6.0"
github "ZipArchive/ZipArchive" "v2.1.3"
github "bitstadium/HockeySDK-Mac" "5.0.0"
github "bmichotte/RegexUtil" "1.0"
github "bmichotte/RegexUtil" "1.1"
github "delba/TextAttributes" "v1.0"
github "groue/GRDB.swift" "v3.2.0"
github "jwilling/JNWCollectionView" "908fcdb5596774ed2179ee4e2bfbfe7e52395ddc"
github "lorentey/BTree" "v4.1.0"
github "mxcl/PromiseKit" "4.5.2"
github "realm/realm-cocoa" "v3.7.4"
github "shpakovski/MASPreferences" "45e5ff67d19babc53414970b0a5db9586a494a96"
github "sparkle-project/Sparkle" "f9740292d4ec9a4168c023551ed28c7e733ec1a8"
github "tid-kijyun/Kanna" "81ce91fd485b637517c340c73590a9b59ac9f7d5"
github "sparkle-project/Sparkle" "8b13eb5dcff89a1a3283b42325b9fd934857cd6b"
github "tid-kijyun/Kanna" "4.0.0"
github "yannickl/AwaitKit" "3.0.2"
50 changes: 0 additions & 50 deletions Dangerfile

This file was deleted.

2 changes: 0 additions & 2 deletions Gemfile
Expand Up @@ -2,8 +2,6 @@
source "https://rubygems.org"

gem 'fastlane'
gem 'danger'
gem 'danger-swiftlint'
gem 'uri_template'
gem 'nokogiri'
gem 'redcarpet'
84 changes: 24 additions & 60 deletions Gemfile.lock
Expand Up @@ -7,63 +7,41 @@ GEM
atomos (0.1.2)
babosa (1.0.2)
claide (1.0.2)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.5.11)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 1.0)
git (~> 1)
kramdown (~> 1.5)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-swiftlint (0.16.0)
danger
rake (> 10)
thor (~> 0.19)
declarative (0.0.10)
declarative-option (0.1.0)
domain_name (0.5.20170404)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.2.1)
dotenv (2.5.0)
emoji_regex (0.1.1)
excon (0.62.0)
faraday (0.14.0)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.1)
fastlane (2.88.0)
fastimage (2.1.3)
fastlane (2.100.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (~> 0.1)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.13.1, < 0.14.0)
google-api-client (>= 0.21.2, < 0.22.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
Expand All @@ -72,23 +50,22 @@ GEM
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.1.0, < 2.0.0)
rubyzip (>= 1.2.1, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.5.7, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
xcpretty (~> 0.2.8)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
git (1.3.0)
google-api-client (0.13.6)
google-api-client (0.21.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.5)
googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
Expand All @@ -107,7 +84,6 @@ GEM
httpclient (2.8.3)
json (2.1.0)
jwt (2.1.0)
kramdown (1.16.2)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
Expand All @@ -121,61 +97,51 @@ GEM
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.4)
nap (1.1.0)
naturally (2.1.0)
no_proxy_fix (0.1.2)
nokogiri (1.8.2)
nanaimo (0.2.6)
naturally (2.2.0)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
octokit (4.8.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
os (0.9.6)
plist (3.4.0)
public_suffix (2.0.5)
rake (12.3.1)
redcarpet (3.4.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.1)
retriable (3.1.2)
rouge (2.0.7)
rubyzip (1.2.1)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
security (0.1.3)
signet (0.8.1)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.2)
simctl (1.6.5)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (1.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.20.0)
tty-cursor (0.5.0)
tty-screen (0.6.4)
tty-cursor (0.6.0)
tty-screen (0.6.5)
tty-spinner (0.8.0)
tty-cursor (>= 0.5.0)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicode-display_width (1.4.0)
uri_template (0.7.0)
word_wrap (1.0.0)
xcodeproj (1.5.7)
xcodeproj (1.5.9)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.2)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.4)
nanaimo (~> 0.2.5)
xcpretty (0.2.8)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.0)
Expand All @@ -185,12 +151,10 @@ PLATFORMS
ruby

DEPENDENCIES
danger
danger-swiftlint
fastlane
nokogiri
redcarpet
uri_template

BUNDLED WITH
1.16.1
1.16.2
4 changes: 2 additions & 2 deletions HSTracker.xcodeproj/project.pbxproj
Expand Up @@ -2504,6 +2504,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -2553,6 +2554,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
Expand All @@ -2573,7 +2575,6 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
"$(PROJECT_DIR)/HSTracker",
);
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
INFOPLIST_FILE = HSTracker/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
Expand Down Expand Up @@ -2605,7 +2606,6 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
"$(PROJECT_DIR)/HSTracker",
);
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
INFOPLIST_FILE = HSTracker/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
Expand Down

0 comments on commit 0053bc0

Please sign in to comment.