diff --git a/fastlane/Fastfile b/fastlane/Fastfile index b7249a4a8..5b1d3a011 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -63,7 +63,7 @@ platform :ios do unless ENV['SEGMENT_API_KEY'].nil? || ENV['SEGMENT_API_KEY'].empty? find_replace_string( path_to_file: './dist/assets/config.json', - old_string: '"SegmentApiKey": "3MT7rAoC0OP7yy3ThzqFSAtKzmzqtUPX"', + old_string: '"SegmentApiKey": "oPPT2MA24VYZTBGDyXtUDa7u50lkPIE4"', new_string: "\"SegmentApiKey\": \"#{ENV['SEGMENT_API_KEY']}\"" ) end diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index b3bdba2a0..1c738dd26 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -4,22 +4,22 @@ GEM CFPropertyList (3.0.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) - atomos (0.1.2) - aws-eventstream (1.0.0) - aws-partitions (1.87.0) - aws-sdk-core (3.21.1) + atomos (0.1.3) + aws-eventstream (1.0.1) + aws-partitions (1.100.0) + aws-sdk-core (3.24.1) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-kms (1.5.0) + aws-sdk-kms (1.7.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.12.0) - aws-sdk-core (~> 3, >= 3.21.1) + aws-sdk-s3 (1.17.0) + aws-sdk-core (~> 3, >= 3.21.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sigv4 (1.0.2) + aws-sigv4 (1.0.3) babosa (1.0.2) claide (1.0.2) colored (1.2) @@ -30,10 +30,10 @@ GEM declarative-option (0.1.0) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - dotenv (2.4.0) + dotenv (2.5.0) emoji_regex (0.1.1) excon (0.62.0) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -41,7 +41,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.3) - fastlane (2.96.1) + fastlane (2.101.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -56,7 +56,7 @@ GEM faraday_middleware (~> 0.9) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.21.2, < 0.22.0) + google-api-client (>= 0.21.2, < 0.24.0) highline (>= 1.7.2, < 2.0.0) json (< 3.0.0) mini_magick (~> 4.5.1) @@ -65,7 +65,7 @@ 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.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -75,27 +75,26 @@ GEM 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) fastlane-plugin-android_change_package_identifier (0.1.0) fastlane-plugin-android_change_string_app_name (0.1.1) nokogiri fastlane-plugin-find_replace_string (0.1.0) gh_inspector (1.1.3) - google-api-client (0.21.2) + google-api-client (0.23.4) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - googleauth (0.6.2) + googleauth (0.6.4) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) - os (~> 0.9) + os (>= 0.9, < 2.0) signet (~> 0.7) highline (1.7.10) http-cookie (1.0.3) @@ -104,31 +103,27 @@ GEM jmespath (1.4.0) json (2.1.0) jwt (2.1.0) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) memoist (0.16.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_magick (4.5.1) mini_portile2 (2.3.0) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nanaimo (0.2.5) - naturally (2.1.0) - nokogiri (1.8.2) + nanaimo (0.2.6) + naturally (2.2.0) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - os (0.9.6) + os (1.0.0) plist (3.4.0) public_suffix (2.0.5) 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) security (0.1.3) @@ -137,22 +132,22 @@ GEM faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.4) + 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) - 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.2) + unicode-display_width (1.4.0) word_wrap (1.0.0) xcodeproj (1.5.9) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/package-lock.json b/package-lock.json index 3ab732733..bf43cb80b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10128,8 +10128,8 @@ } }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#70c5dd56491a9f2315f64624d07ccf5140f236bd", - "from": "github:mattermost/mattermost-redux#70c5dd56491a9f2315f64624d07ccf5140f236bd", + "version": "github:mattermost/mattermost-redux#11902b0d530e5b3303e7fffe74ef8102d25a1893", + "from": "github:mattermost/mattermost-redux#11902b0d530e5b3303e7fffe74ef8102d25a1893", "requires": { "deep-equal": "1.0.1", "eslint-plugin-header": "1.2.0", diff --git a/package.json b/package.json index 28566dd20..d68688d6e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "intl": "1.2.5", "jail-monkey": "1.0.0", "jsc-android": "216113.0.3", - "mattermost-redux": "github:mattermost/mattermost-redux#70c5dd56491a9f2315f64624d07ccf5140f236bd", + "mattermost-redux": "github:mattermost/mattermost-redux#11902b0d530e5b3303e7fffe74ef8102d25a1893", "mime-db": "1.33.0", "prop-types": "15.6.1", "react": "16.3.2",