Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

Commit 056dce3

Browse files
authored
Merge pull request #45 from CAAPIM/develop
MAS-2.2.00
2 parents c2ceb0c + 40007d5 commit 056dce3

3 files changed

Lines changed: 24 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# Version 2.2.00
2+
3+
### Bug fixes
4+
None.
5+
6+
### New features
7+
None.
8+
9+
### Deprecated/Removed
10+
None.
11+
112
# Version 2.1.00
213

314
### Bug fixes

MASStorage.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@
398398
);
399399
runOnlyForDeploymentPostprocessing = 0;
400400
shellPath = /bin/sh;
401-
shellScript = "set -e\n\n#---------------\n#Framework Name \n#---------------\n\nFRAMEWORK_NAME=MASStorage\n\n\n#---------------\n#SDK Directory\n#---------------\n\nSDK_DIR=../iOS_SDK\n\n\n#-----------------------\n#CleanUp Build Cache\n#-----------------------\n\nxcodebuild -project $PROJECT_NAME.xcodeproj -configuration Debug -alltargets clean\nxcodebuild -project $PROJECT_NAME.xcodeproj -configuration Release -alltargets clean\n\n\n#-----------------------\n#CleanUp Previous Builds\n#-----------------------\n\n# Remove the framework from the Project Folder\nrm -Rf \"${PROJECT_DIR}/${FRAMEWORK_NAME}.framework\"\n\n# Remove Build folder from DerivedData\nrm -Rf \"${BUILD_DIR}\"\n\n\n#-----------------------\n#Creating New Builds\n#-----------------------\n\n# define output folder environment variable\nUNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal\nARCHIVE_OUTPUTFOLDER=${OBJROOT}/ArchiveIntermediates/$PROJECT_NAME/IntermediateBuildFilesPath/UninstalledProducts/iphoneos\n\n# Archive framework for iPhoneOS with BitCode enabled\n#xcodebuild -scheme $PROJECT_NAME -configuration Release archive\n\nxcodebuild OTHER_CFLAGS=\"-fembed-bitcode\" -scheme $PROJECT_NAME -configuration Release archive CODE_SIGN_IDENTITY=\"iPhone Distribution: CA, Inc\" -archivePath \"${BUILD_DIR}\"\n\n# Build framework for iPhoneOS\n#xcodebuild -target ${FRAMEWORK_NAME} ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" CODE_SIGN_IDENTITY=\"iPhone Distribution: CA, Inc (RAKRWMN9VH)\"\n\n# Build framework for iPhoneSimulator\nxcodebuild -target ${FRAMEWORK_NAME} -configuration ${CONFIGURATION} -sdk iphonesimulator BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" CODE_SIGN_IDENTITY=\"iPhone Distribution: CA, Inc\"\n\n\n#-----------------------\n#Creating Universal Framework\n#-----------------------\n\nmkdir -p \"${UNIVERSAL_OUTPUTFOLDER}\"\nmkdir -p \"${SDK_DIR}\"\n\n# Build the universal library\nlipo -create -output \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}\" \"${ARCHIVE_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n\n# Copy the .framework folder of iphoneos\ncp -R \"${ARCHIVE_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework\" \"${UNIVERSAL_OUTPUTFOLDER}/\"\n\n# Delete the library for iphoneos\nrm \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n\n# Move the Universal Library into our framework\nmv \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}\" \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/\"\n\n# Remove the _CodeSignature from the UniversalFramework\nrm -Rf \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/_CodeSignature\"\n\n# Copy the framework\ncp -R \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework\" \"${SDK_DIR}\"\n\n#-----------------------\n#Deleting Build Folder\n#-----------------------\n\n# Remove build folder from the Project Folder\nrm -Rf \"${PROJECT_DIR}/build\"\n";
401+
shellScript = "set -e\n\n#---------------\n#Framework Name \n#---------------\n\nFRAMEWORK_NAME=MASStorage\n\n\n#---------------\n#SDK Directory\n#---------------\n\nSDK_DIR=../iOS_SDK\n\n\n#-----------------------\n#CleanUp Build Cache\n#-----------------------\n\nxcodebuild -project $PROJECT_NAME.xcodeproj -configuration Debug -alltargets clean\nxcodebuild -project $PROJECT_NAME.xcodeproj -configuration Release -alltargets clean\n\n\n#-----------------------\n#CleanUp Previous Builds\n#-----------------------\n\n# Remove the framework from the Project Folder\nrm -Rf \"${PROJECT_DIR}/${FRAMEWORK_NAME}.framework\"\n\n# Remove Build folder from DerivedData\nrm -Rf \"${BUILD_DIR}\"\n\n\n#-----------------------\n#Creating New Builds\n#-----------------------\n\n# define output folder environment variable\nUNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/${CONFIGURATION}-universal\nARCHIVE_OUTPUTFOLDER=${OBJROOT}/ArchiveIntermediates/$PROJECT_NAME/IntermediateBuildFilesPath/UninstalledProducts/iphoneos\n\n# Archive framework for iPhoneOS with BitCode enabled\n#xcodebuild -scheme $PROJECT_NAME -configuration Release archive\n\nxcodebuild OTHER_CFLAGS=\"-fembed-bitcode\" -scheme $PROJECT_NAME -configuration Release archive CODE_SIGN_IDENTITY=\"iPhone Distribution: CA, Inc\" -archivePath \"${BUILD_DIR}\"\n\n# Build framework for iPhoneOS\n#xcodebuild -target ${FRAMEWORK_NAME} ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" CODE_SIGN_IDENTITY=\"iPhone Distribution: CA, Inc (RAKRWMN9VH)\"\n\n# Build framework for iPhoneSimulator\nxcodebuild -target ${FRAMEWORK_NAME} -configuration ${CONFIGURATION} -sdk iphonesimulator BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" CODE_SIGN_IDENTITY=\"iPhone Distribution: CA, Inc\" EXCLUDED_ARCHS=\"arm64\"\n\n\n#-----------------------\n#Creating Universal Framework\n#-----------------------\n\nmkdir -p \"${UNIVERSAL_OUTPUTFOLDER}\"\nmkdir -p \"${SDK_DIR}\"\n\n# Build the universal library\nlipo -create -output \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}\" \"${ARCHIVE_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\" \"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n\n# Copy the .framework folder of iphoneos\ncp -R \"${ARCHIVE_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework\" \"${UNIVERSAL_OUTPUTFOLDER}/\"\n\n# Delete the library for iphoneos\nrm \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/${FRAMEWORK_NAME}\"\n\n# Move the Universal Library into our framework\nmv \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}\" \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/\"\n\n# Remove the _CodeSignature from the UniversalFramework\nrm -Rf \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework/_CodeSignature\"\n\n# Copy the framework\ncp -R \"${UNIVERSAL_OUTPUTFOLDER}/${FRAMEWORK_NAME}.framework\" \"${SDK_DIR}\"\n\n#-----------------------\n#Deleting Build Folder\n#-----------------------\n\n# Remove build folder from the Project Folder\nrm -Rf \"${PROJECT_DIR}/build\"\n";
402402
};
403403
/* End PBXShellScriptBuildPhase section */
404404

@@ -478,7 +478,7 @@
478478
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
479479
GCC_WARN_UNUSED_FUNCTION = YES;
480480
GCC_WARN_UNUSED_VARIABLE = YES;
481-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
481+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
482482
MTL_ENABLE_DEBUG_INFO = YES;
483483
ONLY_ACTIVE_ARCH = YES;
484484
SDKROOT = iphoneos;
@@ -520,7 +520,7 @@
520520
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
521521
GCC_WARN_UNUSED_FUNCTION = YES;
522522
GCC_WARN_UNUSED_VARIABLE = YES;
523-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
523+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
524524
MTL_ENABLE_DEBUG_INFO = NO;
525525
SDKROOT = iphoneos;
526526
TARGETED_DEVICE_FAMILY = "1,2";
@@ -534,7 +534,7 @@
534534
isa = XCBuildConfiguration;
535535
buildSettings = {
536536
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
537-
CURRENT_PROJECT_VERSION = 2.1.00;
537+
CURRENT_PROJECT_VERSION = 2.2.00;
538538
DEFINES_MODULE = YES;
539539
DYLIB_COMPATIBILITY_VERSION = 1;
540540
DYLIB_CURRENT_VERSION = 1;
@@ -548,10 +548,10 @@
548548
GCC_PREFIX_HEADER = "MASStorage/MASStorage-PrefixHeader.pch";
549549
INFOPLIST_FILE = MASStorage/Info.plist;
550550
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
551-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
551+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
552552
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
553553
MACH_O_TYPE = mh_dylib;
554-
MARKETING_VERSION = 2.1.00;
554+
MARKETING_VERSION = 2.2.00;
555555
ONLY_ACTIVE_ARCH = NO;
556556
OTHER_LDFLAGS = "";
557557
PRODUCT_BUNDLE_IDENTIFIER = "com.ca.$(PRODUCT_NAME:rfc1034identifier)";
@@ -565,7 +565,7 @@
565565
isa = XCBuildConfiguration;
566566
buildSettings = {
567567
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
568-
CURRENT_PROJECT_VERSION = 2.1.00;
568+
CURRENT_PROJECT_VERSION = 2.2.00;
569569
DEFINES_MODULE = YES;
570570
DYLIB_COMPATIBILITY_VERSION = 1;
571571
DYLIB_CURRENT_VERSION = 1;
@@ -579,10 +579,10 @@
579579
GCC_PREFIX_HEADER = "MASStorage/MASStorage-PrefixHeader.pch";
580580
INFOPLIST_FILE = MASStorage/Info.plist;
581581
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
582-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
582+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
583583
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
584584
MACH_O_TYPE = mh_dylib;
585-
MARKETING_VERSION = 2.1.00;
585+
MARKETING_VERSION = 2.2.00;
586586
ONLY_ACTIVE_ARCH = NO;
587587
OTHER_LDFLAGS = "";
588588
PRODUCT_BUNDLE_IDENTIFIER = "com.ca.$(PRODUCT_NAME:rfc1034identifier)";

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To integrate MASStorage into your Xcode project using CocoaPods, specify it in y
3434

3535
```
3636
source 'https://github.com/CocoaPods/Specs.git'
37-
platform :ios, '9.0'
37+
platform :ios, '14.0'
3838
3939
pod 'MASStorage'
4040
```
@@ -286,9 +286,9 @@ This software may be modified and distributed under the terms
286286
of the MIT license. See the [LICENSE][license-link] file for details.
287287

288288

289-
[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
290-
[get-started]: 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
291-
[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
289+
[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-2.html
290+
[get-started]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-2.html
291+
[docs]: http://techdocs.broadcom.com/content/broadcom/techdocs/us/en/ca-enterprise-software/layer7-api-management/mobile-sdk-for-ca-mobile-api-gateway/2-2.html
292292
[StackOverflow]: http://stackoverflow.com/questions/tagged/massdk
293293
[download]: https://github.com/CAAPIM/iOS-MAS-Storage/archive/master.zip
294294
[contributing]: https://github.com/CAAPIM/iOS-MAS-Storage/blob/develop/CONTRIBUTING.md

0 commit comments

Comments
 (0)