Merge pull request #89 from DAI-Lab/sprint-4-Spatial-Span

Sprint 4 spatial span
DAI-Lab · Jul 1, 2020 · 7abd777 · 7abd777
2 parents 4aeb198 + 75c6460
commit 7abd777
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 75 deletions.
diff --git a/iBOCA.xcodeproj/project.pbxproj b/iBOCA.xcodeproj/project.pbxproj
@@ -389,7 +389,7 @@
 		1B49EEF21DAC3B6600931E8C /* 3DFigureDraw.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 3DFigureDraw.swift; sourceTree = "<group>"; };
 		1B53650D1D7491CF0088B5D2 /* 3DFigureCopy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = 3DFigureCopy.swift; sourceTree = "<group>"; };
 		1B65673F1D7DE07B00C92FA3 /* SemanticListGeneration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SemanticListGeneration.swift; sourceTree = "<group>"; };
-		1BC2DFEB1D4F821F0020D430 /* iBOCA.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iBOCA.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1BC2DFEB1D4F821F0020D430 /* iBOCA Dev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iBOCA Dev.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1BC2DFEE1D4F821F0020D430 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		1BC2DFF01D4F821F0020D430 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
 		1BC2DFF31D4F821F0020D430 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -768,7 +768,7 @@
 		1BC2DFEC1D4F821F0020D430 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				1BC2DFEB1D4F821F0020D430 /* iBOCA.app */,
+				1BC2DFEB1D4F821F0020D430 /* iBOCA Dev.app */,
 				1BC2DFFF1D4F821F0020D430 /* iBOCATests.xctest */,
 				1BC2E00A1D4F821F0020D430 /* iBOCAUITests.xctest */,
 			);
@@ -1261,7 +1261,7 @@
 			packageProductDependencies = (
 			);
 			productName = iBOCA;
-			productReference = 1BC2DFEB1D4F821F0020D430 /* iBOCA.app */;
+			productReference = 1BC2DFEB1D4F821F0020D430 /* iBOCA Dev.app */;
 			productType = "com.apple.product-type.application";
 		};
 		1BC2DFFE1D4F821F0020D430 /* iBOCATests */ = {
@@ -1804,8 +1804,9 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = N4Q7U8RR8X;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1814,14 +1815,15 @@
 				INFOPLIST_FILE = iBOCA/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC++",
 					"-lstdc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.SethIzzyEllison.iBOCA.develop1;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = iBoca.distribution;
+				PRODUCT_BUNDLE_IDENTIFIER = com.SethIzzyEllison.iBOCA.develop;
+				PRODUCT_NAME = "iBOCA Dev";
+				PROVISIONING_PROFILE_SPECIFIER = iBOCA.develop;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/iBOCA/Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
@@ -1832,8 +1834,9 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = N4Q7U8RR8X;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1842,14 +1845,15 @@
 				INFOPLIST_FILE = iBOCA/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 1.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-ObjC++",
 					"-lstdc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.SethIzzyEllison.iBOCA.develop1;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = iBoca.distribution;
+				PRODUCT_BUNDLE_IDENTIFIER = com.SethIzzyEllison.iBOCA.develop;
+				PRODUCT_NAME = "iBOCA Dev";
+				PROVISIONING_PROFILE_SPECIFIER = iBOCA.develop;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/iBOCA/Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};