Merge branch 'master' into greenkeeper/danger-3.0.6

Author: rye

.circleci/config.yml

@@ -152,7 +152,10 @@ jobs:
       - run: *run-danger
 
   android:
-    docker: [{image: 'circleci/android:api-27-node8-alpha'}]
+    # cmd: key is passed to solve a weird issue (see GitHub PR's 2170 and 2173).
+    # this overrides the thing and forces the container to run /bin/bash as the "command"
+    # so it doesn't get confused and OOM/exhaust the build resources (don't ask me)
+    docker: [{image: 'circleci/android:api-27-node8-alpha', cmd: '/bin/bash'}]
     environment:
       task: ANDROID
       FASTLANE_SKIP_UPDATE_CHECK: '1'

android/app/build.gradle

@@ -111,7 +111,8 @@ android {
         }
         manifestPlaceholders = [
             manifestApplicationId: applicationId,
-            gmaps_key: System.getenv("GMAPS_KEY") ?: "",
+            BUGSNAG_KEY: System.getenv("BUGSNAG_KEY") ?: "",
+            GMAPS_KEY: System.getenv("GMAPS_KEY") ?: "",
         ]
     }
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -28,10 +28,10 @@
 
       <meta-data
           android:name="com.bugsnag.android.API_KEY"
-          android:value="aae3a01c545dfa73bc5f1b2d5d661a3e" />
+          android:value="${BUGSNAG_KEY}" />
       <meta-data
         android:name="com.google.android.geo.API_KEY"
-        android:value="${gmaps_key}" />
+        android:value="${GMAPS_KEY}" />
     </application>
 
 </manifest>

data/building-hours/6-3-storp.yaml

@@ -5,7 +5,7 @@ category: Gym
 schedule:
   - title: Hours
     hours:
-      - {days: [Mo, Th, Fr], from: '4:00pm', to: '6:00pm'}
+      - {days: [Mo, Fr], from: '4:00pm', to: '6:00pm'}
 
 breakSchedule:
   fall: []

fastlane/Fastfile

@@ -8,7 +8,39 @@ fastlane_version '2.50.1'
 
 require 'fileutils'
 
-import 'lib/before_all.rb'
+before_all do
+  case lane_context[:PLATFORM_NAME]
+  when :ios
+    setup_circle_ci if circle?
+  end
+
+  # set up global info for `gym`
+  ENV['GYM_PROJECT'] = './ios/AllAboutOlaf.xcodeproj'
+  ENV['GYM_SCHEME'] = 'AllAboutOlaf'
+  ENV['GYM_OUTPUT_DIRECTORY'] = './ios/build'
+  ENV['GYM_OUTPUT_NAME'] = 'AllAboutOlaf'
+
+  # set the testflight itunesconnect provider ID from Appfile
+  ENV['PILOT_ITC_PROVIDER'] = CredentialsManager::AppfileConfig.try_fetch_value(:team_id)
+
+  # set up global info for `gradle`
+  ENV['FL_GRADLE_PROJECT_DIR'] = './android'
+
+  # set up other global shared values
+  lane_context[:PRETTY_APP_NAME] = 'All About Olaf'
+
+  lane_context[:GRADLE_FILE] = "#{ENV['FL_GRADLE_PROJECT_DIR']}/app/build.gradle"
+
+  UI.message "GYM_PROJECT is #{ENV['GYM_PROJECT']}"
+  UI.message "GYM_SCHEME is #{ENV['GYM_SCHEME']}"
+  UI.message "GYM_OUTPUT_DIRECTORY is #{ENV['GYM_OUTPUT_DIRECTORY']}"
+  UI.message "GYM_OUTPUT_NAME is #{ENV['GYM_OUTPUT_NAME']}"
+  UI.message "FL_GRADLE_PROJECT_DIR is #{ENV['FL_GRADLE_PROJECT_DIR']}"
+  UI.message "PRETTY_APP_NAME is #{lane_context[:PRETTY_APP_NAME]}"
+  UI.message "GRADLE_FILE is #{lane_context[:GRADLE_FILE]}"
+  UI.message "PLATFORM_NAME is #{lane_context[:PLATFORM_NAME]}"
+end
+
 import 'lib/commands.rb'
 import 'lib/git.rb'
 import 'lib/sourcemaps.rb'

fastlane/lib/before_all.rb

@@ -60,8 +60,20 @@
   lane :build do
     match(type: 'appstore', readonly: true)
     propagate_version
-    gym(include_bitcode: true,
-        include_symbols: true)
+
+    # save it to a log file for later use
+    FileUtils.mkdir_p('../logs')
+    File.open('../logs/products', 'w') { |file| file.write('[]') }
+    build_status = 0
+    begin
+      gym(include_bitcode: true,
+          include_symbols: true)
+    rescue IOError => e
+      build_status = 1
+      raise e
+    ensure
+      File.open('../logs/build-status', 'w') { |file| file.write(build_status.to_s) }
+    end
   end
 
   desc 'Submit a new Beta Build to Testflight'

fastlane/platforms/ios.rb

@@ -1771,7 +1771,7 @@
 					"$(SRCROOT)/../node_modules/react-native-safari-view",
 					"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1828,7 +1828,7 @@
 					"$(SRCROOT)/../node_modules/react-native-safari-view",
 					"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

ios/AllAboutOlaf.xcodeproj/project.pbxproj

@@ -175,6 +175,7 @@ export class EditHomeRow extends React.Component<Props, State> {
 				</Text>
 
 				<Switch
+					onTintColor={tint}
 					onValueChange={this.onToggleSwitch}
 					value={this.props.isEnabled}
 				/>