Merge branch 'master' of github.com:priitlatt/banaan-ios into tests

priitlatt · Feb 26, 2018 · b27cf4c · b27cf4c
2 parents a4f3131 + 1680561
commit b27cf4c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,3 +63,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+# OS X stuff
+.DS_Store
+
diff --git a/ios-test2/banaan.xcodeproj/project.pbxproj b/ios-test2/banaan.xcodeproj/project.pbxproj
@@ -138,6 +138,7 @@
 				387029471DE479500008D573 /* Sources */,
 				387029481DE479500008D573 /* Frameworks */,
 				387029491DE479500008D573 /* Resources */,
+				38B09D2C1F28853C00024781 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -196,7 +197,7 @@
 				TargetAttributes = {
 					3870294A1DE479500008D573 = {
 						CreatedOnToolsVersion = 8.1;
-						DevelopmentTeam = T44NESVEFN;
+						DevelopmentTeam = MPRGV3Y7Q4;
 						ProvisioningStyle = Automatic;
 					};
 					3870295E1DE479500008D573 = {
@@ -260,6 +261,22 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		38B09D2C1F28853C00024781 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "set -x\n\nDSYM_INFO_PLIST=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist\"\nbuildNumber=$NEVERCODE_BUILD_NUMBER\nstringLength=${#buildNumber}\n\nif [ $stringLength -ne 0 ]; then\n    echo \"Updating build number to $buildNumber\"\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n    if [ -f \"$DSYM_INFO_PLIST\" ]; then\n        /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $BUILD_NUMBER\" \"$DSYM_INFO_PLIST\"\n    fi\nelse\n    echo \"Missing build number, skip updating\"\nfi";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		387029471DE479500008D573 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -418,10 +435,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = T44NESVEFN;
+				DEVELOPMENT_TEAM = MPRGV3Y7Q4;
 				INFOPLIST_FILE = "ios-test2/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.greenhouseci.banaan;
+				PRODUCT_BUNDLE_IDENTIFIER = io.nevercode.banaan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};
@@ -431,10 +448,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = T44NESVEFN;
+				DEVELOPMENT_TEAM = MPRGV3Y7Q4;
 				INFOPLIST_FILE = "ios-test2/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.greenhouseci.banaan;
+				PRODUCT_BUNDLE_IDENTIFIER = io.nevercode.banaan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
 			};

diff --git a/...xcshareddata/xcschemes/ios-test2.xcscheme → ...oj/xcshareddata/xcschemes/banaan.xcscheme b/...xcshareddata/xcschemes/ios-test2.xcscheme → ...oj/xcshareddata/xcschemes/banaan.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0810"
-   version = "1.3">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference

diff --git a/ios-test2/ios-test2/Info.plist b/ios-test2/ios-test2/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>Banaan</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>