Skip to content
This repository has been archived by the owner on Jan 4, 2023. It is now read-only.

Commit

Permalink
- Fixed build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Yastrebov committed Jan 26, 2017
1 parent bbaa513 commit f492689
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 174 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
View file
@@ -1 +1 @@
2.3.0
2.3.3
205 changes: 52 additions & 153 deletions Gemfile.lock
View file
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.3)
CFPropertyList (2.3.4)
RubyInline (3.12.4)
ZenTest (~> 4.3)
ZenTest (4.11.1)
Expand All @@ -17,9 +17,6 @@ GEM
json (~> 1.4)
nokogiri (>= 1.4.4)
babosa (1.0.2)
cert (1.4.4)
fastlane_core (>= 0.55.0, < 1.0.0)
spaceship (>= 0.37.0, < 1.0.0)
claide (1.0.1)
cocoapods (1.1.1)
activesupport (>= 4.0.2, < 5)
Expand All @@ -44,98 +41,70 @@ GEM
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.2)
cocoapods-keys (1.7.0)
cocoapods-downloader (1.1.3)
cocoapods-keys (2.0.0)
dotenv
osx_keychain
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.1.1)
cocoapods-trunk (1.1.2)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.1.0)
colored (1.2)
commander (4.4.0)
commander (4.4.3)
highline (~> 1.7.2)
credentials_manager (0.16.2)
colored
commander (>= 4.3.5)
highline (>= 1.7.1)
security
deliver (1.15.0)
credentials_manager (>= 0.16.2, < 1.0.0)
fastimage (~> 1.6)
fastlane_core (>= 0.53.0, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
spaceship (>= 0.37.0, < 1.0.0)
domain_name (0.5.20161021)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.1)
dotenv (2.1.2)
escape (0.0.4)
excon (0.54.0)
faraday (0.10.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.10.1)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
fastimage (1.6.8)
addressable (~> 2.3, >= 2.3.5)
fastlane (1.108.0)
fastimage (2.0.1)
addressable (~> 2)
fastlane (2.11.0)
activesupport (< 5)
addressable (>= 2.3, < 3.0.0)
bundler (~> 1.12)
cert (>= 1.4.4, < 2.0.0)
credentials_manager (>= 0.16.2, < 1.0.0)
deliver (>= 1.15.0, < 2.0.0)
fastlane_core (>= 0.55.0, < 1.0.0)
frameit (>= 3.0.0, < 4.0.0)
gym (>= 1.12.0, < 2.0.0)
krausefx-shenzhen (>= 0.14.11, < 1.0.0)
match (>= 0.11.0, < 1.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0)
colored
commander (>= 4.4.0, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (>= 1.6)
gh_inspector (>= 1.0.1, < 2.0.0)
google-api-client (~> 0.9.2)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
multi_json
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
pem (>= 1.4.0, < 2.0.0)
pilot (>= 1.12.0, < 2.0.0)
plist (>= 3.1.0, < 4.0.0)
produce (>= 1.3.0, < 2.0.0)
scan (>= 0.14.1, < 1.0.0)
screengrab (>= 0.5.2, < 1.0.0)
sigh (>= 1.11.2, < 2.0.0)
rubyzip (>= 1.1.0, < 2.0.0)
security (= 0.1.3)
slack-notifier (>= 1.3, < 2.0.0)
snapshot (>= 1.16.3, < 2.0.0)
spaceship (>= 0.37.0, < 1.0.0)
supply (>= 0.7.1, < 1.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
word_wrap (~> 1.0.0)
xcode-install (~> 2.0.0)
xcodeproj (>= 0.20, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
fastlane_core (0.55.0)
babosa
colored
commander (>= 4.4.0, <= 5.0.0)
credentials_manager (>= 0.16.2, < 1.0.0)
excon (>= 0.45.0, < 1.0)
gh_inspector (>= 1.0.1, < 2.0.0)
highline (>= 1.7.2)
json
multi_json
plist (>= 3.1.0, < 4.0.0)
rubyzip (~> 1.1.6)
terminal-table (>= 1.4.5, < 2.0.0)
xcpretty-travis-formatter (>= 0.0.3)
fourflusher (2.0.1)
frameit (3.0.0)
deliver (> 0.3)
fastimage (~> 1.6.3)
fastlane_core (>= 0.53.0, < 1.0.0)
mini_magick (~> 4.5.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.2)
google-api-client (0.9.20)
gh_inspector (1.0.3)
google-api-client (0.9.24)
addressable (~> 2.3)
googleauth (~> 0.5)
httpclient (~> 2.7)
Expand All @@ -152,144 +121,74 @@ GEM
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
gym (1.12.0)
fastlane_core (>= 0.53.0, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 1.1.7)
terminal-table (>= 1.4.5, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
highline (1.7.8)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.2.4)
httpclient (2.8.3)
hurley (0.2)
i18n (0.7.0)
json (1.8.3)
json (1.8.6)
jwt (1.5.6)
krausefx-shenzhen (0.14.11)
commander (>= 4.3, < 5.0)
dotenv (>= 0.7)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
highline (>= 1.7.2)
json (~> 1.8)
net-sftp (~> 2.1.2)
plist (>= 3.1.0, < 4.0.0)
rubyzip (~> 1.1)
security (~> 0.1.3)
terminal-table (~> 1.4.5)
little-plugger (1.1.4)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
match (0.11.0)
cert (>= 1.4.3, < 2.0.0)
credentials_manager (>= 0.16.2, < 1.0.0)
fastlane_core (>= 0.55.0, < 1.0.0)
security
sigh (>= 1.11.2, < 2.0.0)
spaceship (>= 0.37.0, < 1.0.0)
memoist (0.15.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.5.1)
mini_portile2 (2.0.0)
minitest (5.9.1)
molinillo (0.5.3)
mini_portile2 (2.1.0)
minitest (5.10.1)
molinillo (0.5.5)
multi_json (1.12.1)
multi_xml (0.5.5)
multi_xml (0.6.0)
multipart-post (2.0.0)
mustache (0.99.8)
nanaimo (0.2.2)
nanaimo (0.2.3)
nap (1.1.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
netrc (0.7.8)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
os (0.9.6)
osx_keychain (1.0.1)
RubyInline (~> 3)
pem (1.4.0)
fastlane_core (>= 0.53.0, < 1.0.0)
spaceship (>= 0.36.2, < 1.0.0)
pilot (1.12.0)
credentials_manager (>= 0.16.0)
fastlane_core (>= 0.53.0, < 1.0.0)
spaceship (>= 0.37.0, < 1.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
plist (3.2.0)
produce (1.3.0)
fastlane_core (>= 0.53.0, < 1.0.0)
spaceship (>= 0.37.0, < 1.0.0)
public_suffix (2.0.4)
public_suffix (2.0.5)
representable (2.3.0)
uber (~> 0.0.7)
retriable (2.1.0)
rouge (1.11.1)
rubyzip (1.1.7)
sbconstants (1.1.2)
scan (0.14.1)
fastlane_core (>= 0.53.0, < 1.0.0)
slack-notifier (~> 1.3)
terminal-table (>= 1.4.5, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
xcpretty-travis-formatter (>= 0.0.3)
screengrab (0.5.5)
fastlane_core (>= 0.52.1, < 1.0.0)
rubyzip (1.2.0)
sbconstants (1.2.0)
second_curtain (0.6.0)
aws-sdk-v1 (~> 1.52)
mustache (~> 0.99)
security (0.1.3)
sigh (1.11.2)
fastlane_core (>= 0.52.1, < 1.0.0)
plist (~> 3.1)
spaceship (>= 0.34.2, < 1.0.0)
signet (0.7.3)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
multi_json (~> 1.10)
slack-notifier (1.5.1)
snapshot (1.16.3)
fastimage (~> 1.6.3)
fastlane_core (>= 0.53.0, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
spaceship (0.37.0)
colored
credentials_manager (>= 0.16.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (~> 1.6)
multi_xml (~> 0.5)
plist (>= 3.1.0, < 4.0.0)
supply (0.7.1)
credentials_manager (>= 0.15.0)
fastlane_core (>= 0.43.4)
google-api-client (~> 0.9.1)
terminal-notifier (1.7.1)
terminal-table (1.4.5)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.15)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.1.3)
word_wrap (1.0.0)
xcode-install (2.0.9)
claide (>= 0.9.1, < 1.1.0)
spaceship (>= 0.25.1, < 1.0.0)
xcodeproj (1.4.1)
xcodeproj (1.4.2)
CFPropertyList (~> 2.3.3)
activesupport (>= 3)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)
nanaimo (~> 0.2.0)
nanaimo (~> 0.2.3)
xcpretty (0.2.4)
rouge (~> 1.8)
xcpretty-travis-formatter (0.0.4)
Expand All @@ -306,4 +205,4 @@ DEPENDENCIES
second_curtain

BUNDLED WITH
1.12.5
1.13.7
8 changes: 6 additions & 2 deletions Kiosk.xcodeproj/project.pbxproj
View file
Expand Up @@ -956,7 +956,7 @@
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = Artsy;
TargetAttributes = {
5EB0B6EC1A5C3E6800B7CBF2 = {
Expand Down Expand Up @@ -1433,6 +1433,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 9D18FBF2740DA862421FE723 /* Pods-Kiosk.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -1458,6 +1459,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 105ED099C82E240D7547D3A6 /* Pods-Kiosk.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand All @@ -1474,7 +1476,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "Kiosk/Supporting Files/BridgingHeader.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
};
Expand All @@ -1484,6 +1486,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 276814418ACEF21BC773CB08 /* Pods-KioskTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ENABLE_MODULES = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand All @@ -1509,6 +1512,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 620BB28AC1DE3936837D2731 /* Pods-KioskTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ENABLE_MODULES = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand Down
2 changes: 1 addition & 1 deletion Kiosk.xcodeproj/xcshareddata/xcschemes/Kiosk.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
4 changes: 2 additions & 2 deletions Kiosk/Admin/AdminCardTestingViewController.swift
View file
Expand Up @@ -16,9 +16,9 @@ class AdminCardTestingViewController: UIViewController {
self.logTextView.text = ""

if AppSetup.sharedState.useStaging {
cardHandler = CardHandler(apiKey: self.keys.cardflightStagingAPIClientKey(), accountToken: self.keys.cardflightStagingMerchantAccountToken())
cardHandler = CardHandler(apiKey: self.keys.cardflightStagingAPIClientKey, accountToken: self.keys.cardflightStagingMerchantAccountToken)
} else {
cardHandler = CardHandler(apiKey: self.keys.cardflightProductionAPIClientKey(), accountToken: self.keys.cardflightProductionMerchantAccountToken())
cardHandler = CardHandler(apiKey: self.keys.cardflightProductionAPIClientKey, accountToken: self.keys.cardflightProductionMerchantAccountToken)
}

cardHandler.cardStatus
Expand Down

0 comments on commit f492689

Please sign in to comment.