Merge master into pause-is-closed

Author: hawkrives

fastlane/Appfile

@@ -1,11 +1,8 @@
 # The bundle identifier of your app
-app_identifier 'com.volz.drew.aao.rogue'
+app_identifier 'NFMTHAZVS9.com.drewvolz.stolaf'
 
 # Your Apple email address
-apple_id '[email protected]'
-
-# Developer Portal Team ID
-team_id 'NFMTHAZVS9'
+apple_id '[email protected]'
 
 # you can even provide different app identifiers, Apple IDs and team names per lane:
 # More information: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Appfile.md

fastlane/Matchfile

@@ -1,7 +1,4 @@
 git_url 'https://github.com/hawkrives/aao-keys'
 
 # Your Apple Developer Portal username
-username '[email protected]'
-
-# The app identifiers to get profiles for
-app_identifier ['com.volz.drew.aao.rogue']
+username '[email protected]'

fastlane/README.md

@@ -97,31 +97,16 @@ Runs all the tests
 fastlane ios screenshot
 ```
 Take screenshots
-### ios go-rogue
-```
-fastlane ios go-rogue
-```
-Go rogue
 ### ios build
 ```
 fastlane ios build
 ```
 Provisions the profiles; bumps the build number; builds the app
-### ios rogue-build
-```
-fastlane ios rogue-build
-```
-Build, but for the rogue devs
-### ios rogue-beta
-```
-fastlane ios rogue-beta
-```
-Make a beta, but for the rogue devs
 ### ios beta
 ```
 fastlane ios beta
 ```
-Submit a new Beta Build to HockeyApp
+Submit a new Beta Build to Testflight
 ### ios ci-run
 ```
 fastlane ios ci-run

fastlane/lib/util.rb

@@ -16,10 +16,12 @@ def hockeyapp_version_commit
 
 # Gets the version, either from Travis or from Hockey
 def current_build_number
-  ENV['TRAVIS_BUILD_NUMBER'] if ENV.key?('TRAVIS_BUILD_NUMBER')
+  if ENV.key?('TRAVIS_BUILD_NUMBER')
+    return ENV['TRAVIS_BUILD_NUMBER']
+  end
 
   begin
-    (latest_hockeyapp_version_number + 1).to_s
+    (latest_testflight_build_number + 1).to_s
   rescue
     '1'
   end

fastlane/platforms/ios.rb

@@ -13,55 +13,34 @@
              project: ENV['GYM_PROJECT'])
   end
 
-  desc 'Go rogue'
-  lane :'go-rogue' do
-    activate_rogue_team
-  end
-
   desc 'Provisions the profiles; bumps the build number; builds the app'
   lane :build do
-    # make sure we have a copy of the data files
-    bundle_data
-
     sh('security find-identity -v -p codesigning')
 
     # Build the app
     gym(export_method: 'ad-hoc')
   end
 
-  desc 'Build, but for the rogue devs'
-  lane :'rogue-build' do
-    activate_rogue_team
-    match(type: 'adhoc', readonly: true)
-    build
-  end
-
-  desc 'Make a beta, but for the rogue devs'
-  lane :'rogue-beta' do
-    activate_rogue_team
-    match(type: 'adhoc', readonly: true)
-    set_version
-    beta
-  end
-
-  desc 'Submit a new Beta Build to HockeyApp'
+  desc 'Submit a new Beta Build to Testflight'
   lane :beta do
-    badge
+    match(type: 'appstore', readonly: true)
+    increment_build_number(build_number: latest_testflight_build_number + 1,
+                           xcodeproj: ENV['GYM_PROJECT'])
 
-    build
+    gym(export_method: 'app-store')
 
-    hockey(notes: release_notes)
+    testflight
   end
 
   desc 'Run iOS builds or tests, as appropriate'
   lane :'ci-run' do
     # set up things so they can run
     authorize_ci_for_keys
     ci_keychains
-    activate_rogue_team
 
     # Set up code signing correctly
     # (more information: https://codesigning.guide)
+    match(type: 'appstore', readonly: true)
     match(type: 'adhoc', readonly: true)
 
     # set the app version

ios/AllAboutOlaf.xcodeproj/project.pbxproj

@@ -813,6 +813,7 @@
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
+				6776346D1ECC93FA00C6F018 /* Bundle Data Files */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 			);
 			buildRules = (
@@ -1309,6 +1310,20 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
 		};
+		6776346D1ECC93FA00C6F018 /* Bundle Data Files */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Bundle Data Files";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "npm run bundle-data";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1392,7 +1407,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = "AllAboutOlaf/All About Olaf.entitlements";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				DEAD_CODE_STRIPPING = NO;
+				DEVELOPMENT_TEAM = 363G7T9TGX;
 				ENABLE_TESTABILITY = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1422,8 +1440,10 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "NFMTHAZVS9.com.drewvolz.stolaf-";
+				PRODUCT_BUNDLE_IDENTIFIER = NFMTHAZVS9.com.drewvolz.stolaf;
 				PRODUCT_NAME = "All About Olaf";
+				PROVISIONING_PROFILE = "328dc8bb-bb74-41f9-826a-ef2abd098c6a";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore NFMTHAZVS9.com.drewvolz.stolaf";
 				SWIFT_OBJC_BRIDGING_HEADER = "AllAboutOlafUITests/AllAboutOlaf-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
@@ -1435,6 +1455,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = "AllAboutOlaf/All About Olaf.entitlements";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				DEVELOPMENT_TEAM = 363G7T9TGX;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -1463,8 +1486,10 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "NFMTHAZVS9.com.drewvolz.stolaf-";
+				PRODUCT_BUNDLE_IDENTIFIER = NFMTHAZVS9.com.drewvolz.stolaf;
 				PRODUCT_NAME = "All About Olaf";
+				PROVISIONING_PROFILE = "328dc8bb-bb74-41f9-826a-ef2abd098c6a";
+				PROVISIONING_PROFILE_SPECIFIER = "match AppStore NFMTHAZVS9.com.drewvolz.stolaf";
 				SWIFT_OBJC_BRIDGING_HEADER = "AllAboutOlafUITests/AllAboutOlaf-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 			};

ios/AllAboutOlaf/All About Olaf.entitlements

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
 </plist>

ios/AllAboutOlaf/Info.plist

@@ -37,6 +37,8 @@
 	<string>1</string>
 	<key>CodePushDeploymentKey</key>
 	<string>oSozdf5RtDr2j8T7PFz-oWgNmoBIEJN_nzUOz</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>KSTORadio</string>
@@ -82,7 +84,7 @@
 		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>We only use your location when you would expect us to, and never when you aren't using the app.</string>
+	<string>We only use your location when you would expect us to, and never when you aren&apos;t using the app.</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Entypo.ttf</string>