Skip to content

Commit de29325

Browse files
authored
Merge pull request #14 from codeRIT/peter-final
Final
2 parents 0a709a0 + 0204681 commit de29325

39 files changed

Lines changed: 205 additions & 155 deletions

BrickHack-Mobile.xcodeproj/project.pbxproj

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
21BEA9C216BEFB0D956DA447 /* Pods_BrickHack_Mobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6555C1DC150ED20E523915E /* Pods_BrickHack_Mobile.framework */; };
1111
31602385220A116000F73F58 /* EventsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31602384220A116000F73F58 /* EventsViewController.swift */; };
12-
31A6A37821F6681100D9C085 /* CoreNFC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31A6A37321F6665D00D9C085 /* CoreNFC.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
1312
31AC34DE21DDB8D3005A419E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31AC34DD21DDB8D3005A419E /* Launch Screen.storyboard */; };
1413
31C5F541219B29CD00E3E1AF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31C5F540219B29CD00E3E1AF /* AppDelegate.swift */; };
1514
31C5F546219B29CD00E3E1AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 31C5F544219B29CD00E3E1AF /* Main.storyboard */; };
@@ -46,7 +45,7 @@
4645
31A6A37321F6665D00D9C085 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
4746
31AC34DD21DDB8D3005A419E /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
4847
31B205BE21EFB00700D6ADF7 /* libVYNFCKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libVYNFCKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
49-
31C5F53D219B29CD00E3E1AF /* BrickHack-Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BrickHack-Mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
48+
31C5F53D219B29CD00E3E1AF /* BrickHack 6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BrickHack 6.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5049
31C5F540219B29CD00E3E1AF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5150
31C5F545219B29CD00E3E1AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5251
31C5F547219B29CF00E3E1AF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -74,7 +73,6 @@
7473
isa = PBXFrameworksBuildPhase;
7574
buildActionMask = 2147483647;
7675
files = (
77-
31A6A37821F6681100D9C085 /* CoreNFC.framework in Frameworks */,
7876
21BEA9C216BEFB0D956DA447 /* Pods_BrickHack_Mobile.framework in Frameworks */,
7977
);
8078
runOnlyForDeploymentPostprocessing = 0;
@@ -106,7 +104,7 @@
106104
31C5F53E219B29CD00E3E1AF /* Products */ = {
107105
isa = PBXGroup;
108106
children = (
109-
31C5F53D219B29CD00E3E1AF /* BrickHack-Mobile.app */,
107+
31C5F53D219B29CD00E3E1AF /* BrickHack 6.app */,
110108
);
111109
name = Products;
112110
sourceTree = "<group>";
@@ -189,7 +187,7 @@
189187
);
190188
name = "BrickHack-Mobile";
191189
productName = "BrickHack-Mobile";
192-
productReference = 31C5F53D219B29CD00E3E1AF /* BrickHack-Mobile.app */;
190+
productReference = 31C5F53D219B29CD00E3E1AF /* BrickHack 6.app */;
193191
productType = "com.apple.product-type.application";
194192
};
195193
/* End PBXNativeTarget section */
@@ -444,7 +442,6 @@
444442
isa = XCBuildConfiguration;
445443
baseConfigurationReference = C029FC28202ED2177D811FF7 /* Pods-BrickHack-Mobile.debug.xcconfig */;
446444
buildSettings = {
447-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
448445
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
449446
CODE_SIGN_ENTITLEMENTS = "BrickHack-Mobile/BrickHack-Mobile.entitlements";
450447
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -456,7 +453,8 @@
456453
"@executable_path/Frameworks",
457454
);
458455
PRODUCT_BUNDLE_IDENTIFIER = io.BrickHack.Mobile;
459-
PRODUCT_NAME = "$(TARGET_NAME)";
456+
MARKETING_VERSION = 1.0;
457+
PRODUCT_NAME = "BrickHack 6";
460458
PROVISIONING_PROFILE_SPECIFIER = "";
461459
SWIFT_VERSION = 4.2;
462460
TARGETED_DEVICE_FAMILY = 1;
@@ -467,7 +465,6 @@
467465
isa = XCBuildConfiguration;
468466
baseConfigurationReference = DF9A947946DF6E11797CE707 /* Pods-BrickHack-Mobile.release.xcconfig */;
469467
buildSettings = {
470-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
471468
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
472469
CODE_SIGN_ENTITLEMENTS = "BrickHack-Mobile/BrickHack-Mobile.entitlements";
473470
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -479,7 +476,8 @@
479476
"@executable_path/Frameworks",
480477
);
481478
PRODUCT_BUNDLE_IDENTIFIER = io.BrickHack.Mobile;
482-
PRODUCT_NAME = "$(TARGET_NAME)";
479+
MARKETING_VERSION = 1.0;
480+
PRODUCT_NAME = "BrickHack 6";
483481
PROVISIONING_PROFILE_SPECIFIER = "";
484482
SWIFT_VERSION = 4.2;
485483
TARGETED_DEVICE_FAMILY = 1;
102 KB
Loading
-63.3 KB
Binary file not shown.
8.41 KB
Loading
8.74 KB
Loading
13.4 KB
Loading
-1.36 KB
Binary file not shown.
-2.34 KB
Binary file not shown.
-2.34 KB
Binary file not shown.
-3.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)