Merge pull request #73 from CAAPIM/merge-develop

Merge develop

Author: manutripathi82

CHANGELOG.md

@@ -1,11 +1,16 @@
-# Version 1.9.20
+# Version 2.0.00
 
 ### Bug fixes
 None.
 
 ### New features
 None.
 
+# Version 1.9.20
+
+### New features
+- MASUI framework now has new dependency on [MASProximity][MASProximity] framework. No code change is required, and no functionality change was made. [US584914] 
+
 # Version 1.9.10
 
 ### Bug fixes
@@ -131,11 +136,10 @@ None.
 
 - .
 
-
+ [MASProximity]: https://github.com/CAAPIM/iOS-MAS-Proximity
  [mag]: https://docops.ca.com/mag
- [mas.ca.com]: http://mas.ca.com/
- [docs]: http://mas.ca.com/docs/
- [blog]: http://mas.ca.com/blog/
+ [techdocs.broadcom.com]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.html
+ [docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-0.html
 
  [releases]: ../../releases
  [contributing]: /CONTRIBUTING.md

CONTRIBUTING.md

@@ -21,13 +21,13 @@ Follow these steps for pull requests:
 6. If you haven't already, complete the [Contributor License Agreement ("CLA")][cla].
 
 ### Contributor License Agreement ("CLA")
-To accept pull requests, submit a CLA. (Submitting a single CLA lets you work on any open source projects from CA, Inc.)
+To accept pull requests, submit a CLA. (Submitting a single CLA lets you work on any open source projects from Broadcom, Inc.)
 
 Complete your CLA here: <https://www.clahub.com/agreements/CAAPIM/iOS-MAS-UI>
 
 ## Bugs
-We work hard to avoid them, but they still happen. If you're a CA customer, open an issue in our [Support Page][casupport], otherwise use GitHub issues.
-To share ideas or ask product-related questions go to [CA Communities][community].
+We work hard to avoid them, but they still happen. If you're a Broadcom customer, open an issue in our [Support Page][casupport], otherwise use GitHub issues.
+To share ideas or ask product-related questions go to [Broadcom Communities][community].
 
 ### Known Issues
 We also use GitHub issues for updates to known issues, including alerts when fixes are in progress. 
@@ -48,8 +48,8 @@ By contributing to the IOS Mobile SDK, you agree that your contributions will be
 
 
 [guidelines]: /GUIDELINES.md
-[community]: https://communities.ca.com/community/ca-api-management-community/content?filterID=contentstatus%5Bpublished%5D~category%5Bca-mobile-api-gateway%5D
+[community]: https://community.broadcom.com/enterprisesoftware/communities/communityhomeblogs?CommunityKey=0f580f5f-30a4-41de-a75c-e5f433325a18
 [license-link]: /LICENSE
 [cla]: https://www.clahub.com/agreements/CAAPIM/iOS-MAS-UI
-[casupport]: https://support.ca.com/irj/portal/implsvcnewcase
+[casupport]: https://casupport.broadcom.com
 

GUIDELINES.md

@@ -1,4 +1,4 @@
-# CA Technologies Objective-C Style Guide
+# Broadcom Technologies Objective-C Style Guide
 
 This document describes the Objective-C coding style of the iOS Mobile SDK team.  This guideline is recommended to comply with all Objective-C implementations of our products.
 

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 CA. All rights reserved.
+Copyright (c) 2019 Broadcom. All Rights Reserved.
+The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE.md

@@ -1,7 +1,8 @@
 The MIT License (MIT)
 =====================
 
-Copyright (c) 2016 CA. All rights reserved.
+Copyright (c) 2019 Broadcom. All Rights Reserved.
+The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

MASUI.xcodeproj/project.pbxproj

@@ -210,6 +210,27 @@
 			remoteGlobalIDString = 104661101C06581500A2A03C;
 			remoteInfo = MASUI;
 		};
+		CBBC7BD1226E780600ABA2BA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CBBC7BC9226E780600ABA2BA /* MASProximity.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CBA4234122662C9C00B8D617;
+			remoteInfo = MASProximity;
+		};
+		CBBC7BD3226E780600ABA2BA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CBBC7BC9226E780600ABA2BA /* MASProximity.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CBA4234A22662C9C00B8D617;
+			remoteInfo = MASProximityTests;
+		};
+		CBBC7BD5226E783400ABA2BA /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CBBC7BC9226E780600ABA2BA /* MASProximity.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CBA4234022662C9C00B8D617;
+			remoteInfo = MASProximity;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -322,6 +343,7 @@
 		CB8DDC941E84A22000B25AA9 /* MASLoginQRCodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASLoginQRCodeView.h; sourceTree = "<group>"; };
 		CB8DDC951E84A22000B25AA9 /* MASLoginQRCodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASLoginQRCodeView.m; sourceTree = "<group>"; };
 		CB8DDC981E84A22E00B25AA9 /* MASLoginQRCodeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MASLoginQRCodeView.xib; sourceTree = "<group>"; };
+		CBBC7BC9226E780600ABA2BA /* MASProximity.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MASProximity.xcodeproj; path = ../MASProximity/MASProximity.xcodeproj; sourceTree = "<group>"; };
 		CBC88F9C1DBE86E2009EE1C6 /* MASBaseLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MASBaseLoginViewController.h; sourceTree = "<group>"; };
 		CBC88F9D1DBE86E2009EE1C6 /* MASBaseLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MASBaseLoginViewController.m; sourceTree = "<group>"; };
 		CBC88FA11DBFED83009EE1C6 /* MAS+UI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MAS+UI.h"; sourceTree = "<group>"; };
@@ -372,6 +394,7 @@
 		104661071C06581500A2A03C = {
 			isa = PBXGroup;
 			children = (
+				CBBC7BC9226E780600ABA2BA /* MASProximity.xcodeproj */,
 				10246AB91CBAA82600C0A70A /* MASFoundation.xcodeproj */,
 				104661131C06581500A2A03C /* MASUI */,
 				1046611F1C06581500A2A03C /* MASUITests */,
@@ -633,6 +656,15 @@
 			path = sociallogin;
 			sourceTree = "<group>";
 		};
+		CBBC7BCA226E780600ABA2BA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CBBC7BD2226E780600ABA2BA /* MASProximity.framework */,
+				CBBC7BD4226E780600ABA2BA /* MASProximityTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		CBC88F9B1DBE7F2B009EE1C6 /* ui */ = {
 			isa = PBXGroup;
 			children = (
@@ -715,6 +747,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				CBBC7BD6226E783400ABA2BA /* PBXTargetDependency */,
 				10246AC41CBAA83C00C0A70A /* PBXTargetDependency */,
 			);
 			name = MASUI;
@@ -780,6 +813,10 @@
 					ProductGroup = 10246ABA1CBAA82600C0A70A /* Products */;
 					ProjectRef = 10246AB91CBAA82600C0A70A /* MASFoundation.xcodeproj */;
 				},
+				{
+					ProductGroup = CBBC7BCA226E780600ABA2BA /* Products */;
+					ProjectRef = CBBC7BC9226E780600ABA2BA /* MASProximity.xcodeproj */;
+				},
 			);
 			projectRoot = "";
 			targets = (
@@ -806,6 +843,20 @@
 			remoteRef = 10246AC11CBAA82600C0A70A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		CBBC7BD2226E780600ABA2BA /* MASProximity.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = MASProximity.framework;
+			remoteRef = CBBC7BD1226E780600ABA2BA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CBBC7BD4226E780600ABA2BA /* MASProximityTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = MASProximityTests.xctest;
+			remoteRef = CBBC7BD3226E780600ABA2BA /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -1011,6 +1062,11 @@
 			target = 104661101C06581500A2A03C /* MASUI */;
 			targetProxy = 1046611D1C06581500A2A03C /* PBXContainerItemProxy */;
 		};
+		CBBC7BD6226E783400ABA2BA /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = MASProximity;
+			targetProxy = CBBC7BD5226E783400ABA2BA /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
@@ -1147,7 +1203,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1.9.20;
+				CURRENT_PROJECT_VERSION = 2.0.00;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -1178,7 +1234,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1.9.20;
+				CURRENT_PROJECT_VERSION = 2.0.00;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

MASUI/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.20</string>
+	<string>2.0.00</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

MASUI/MASUI_PrefixHeader.pch

@@ -15,11 +15,12 @@
 // You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
 
 #import <MASFoundation/MASFoundation.h>
+#import <MASProximity/MASProximity.h>
 
 #endif /* MASUI_PrefixHeader_pch */
 
 #ifdef DEBUG
 #   define DLog(fmt, ...) NSLog((@"%s [Line %d] " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
 #else
 #   define DLog(...)
-#endif
+#endif