Skip to content

Commit

Permalink
Stepping the swift modules, modified the podspec and updating the lat…
Browse files Browse the repository at this point in the history 
…est module
  • Loading branch information
@pankajtaneja86
pankajtaneja86 committed Sep 27, 2017
1 parent 75d7c2b commit 452b769
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 19 deletions.
Binary file modified AcceptSDK-Framework/AcceptSDK.framework/AcceptSDK
View file
Binary file not shown.
Binary file modified AcceptSDK-Framework/AcceptSDK.framework/Info.plist
View file
Binary file not shown.
Binary file modified AcceptSDK-Framework/AcceptSDK.framework/Modules/AcceptSDK.swiftmodule/arm.swiftmodule
View file
Binary file not shown.
Binary file modified AcceptSDK-Framework/AcceptSDK.framework/Modules/AcceptSDK.swiftmodule/arm64.swiftmodule
View file
Binary file not shown.
Binary file removed AcceptSDK-Framework/AcceptSDK.framework/Modules/AcceptSDK.swiftmodule/i386.swiftdoc
View file
Binary file not shown.
Binary file removed AcceptSDK-Framework/AcceptSDK.framework/Modules/AcceptSDK.swiftmodule/i386.swiftmodule
View file
Binary file not shown.
Binary file removed AcceptSDK-Framework/AcceptSDK.framework/Modules/AcceptSDK.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file removed AcceptSDK-Framework/AcceptSDK.framework/Modules/AcceptSDK.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
Binary file added AcceptSDK-Framework/AcceptSDK.framework/libswiftRemoteMirror.dylib
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion AcceptSDK.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "#!/bin/bash\n\nset -e\n\nabort() {\n echo \"[fatal] $1\"\n exit 1\n}\n\ntest -n \"${PROJECT_NAME}\" || abort \"This script should not be run from the command line, but is used by Xcode\"\n\n######################\n# Options\n######################\n\nREVEAL_ARCHIVE_IN_FINDER=true\n\nFRAMEWORK_NAME=\"${PROJECT_NAME}\"\n\nSIMULATOR_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${FRAMEWORK_NAME}.framework\"\n\nDEVICE_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FRAMEWORK_NAME}.framework\"\n\nUNIVERSAL_LIBRARY_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneuniversal\"\n\nFRAMEWORK=\"${UNIVERSAL_LIBRARY_DIR}/${FRAMEWORK_NAME}.framework\"\n\n\n######################\n# Build Frameworks\n######################\n\nxcodebuild -workspace \"${FRAMEWORK_NAME}.xcworkspace\" -scheme \"${FRAMEWORK_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" || exit 1\nxcodebuild -workspace \"${FRAMEWORK_NAME}.xcworkspace\" -scheme \"${FRAMEWORK_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" || exit 1\n\n\n######################\n# Create directory for universal\n######################\n\nrm -rf \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${FRAMEWORK}\"\n\n\n######################\n# Copy files Framework\n######################\n\ncp -r \"${DEVICE_LIBRARY_PATH}/.\" \"${FRAMEWORK}\"\n\n\n######################\n# Make an universal binary\n######################\n\nset -o pipefail\nlipo \"${SIMULATOR_LIBRARY_PATH}/${FRAMEWORK_NAME}\" \"${DEVICE_LIBRARY_PATH}/${FRAMEWORK_NAME}\" -create -output \"${FRAMEWORK}/${FRAMEWORK_NAME}\" | echo || exit 1\n\nrm -rf ${FRAMEWORK}/libswiftRemoteMirror.dylib\n\n# For Swift framework, Swiftmodule needs to be copied in the universal framework\nif [ -d \"${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" ]; then\ncp -f ${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* \"${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" | echo\n fi\n \n if [ -d \"${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" ]; then\n cp -f ${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* \"${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" | echo\n fi\n \n if [ -n \"${WORKSPACE}\" ]; then\n cp -r \"${FRAMEWORK}\" \"${WORKSPACE}\"\n elif [ ${REVEAL_ARCHIVE_IN_FINDER} = true ]; then\n open \"${UNIVERSAL_LIBRARY_DIR}/\"\n fi\n";
shellScript = "#!/bin/bash\n\nset -e\n\nabort() {\n echo \"[fatal] $1\"\n exit 1\n}\n\ntest -n \"${PROJECT_NAME}\" || abort \"This script should not be run from the command line, but is used by Xcode\"\n\n######################\n# Options\n######################\n\nREVEAL_ARCHIVE_IN_FINDER=true\n\nFRAMEWORK_NAME=\"${PROJECT_NAME}\"\n\nSIMULATOR_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${FRAMEWORK_NAME}.framework\"\n\nDEVICE_LIBRARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/${FRAMEWORK_NAME}.framework\"\n\nUNIVERSAL_LIBRARY_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneuniversal\"\n\nFRAMEWORK=\"${UNIVERSAL_LIBRARY_DIR}/${FRAMEWORK_NAME}.framework\"\n\n\n######################\n# Build Frameworks\n######################\n\nxcodebuild -workspace \"${FRAMEWORK_NAME}.xcworkspace\" -scheme \"${FRAMEWORK_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphoneos BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" || exit 1\nxcodebuild -workspace \"${FRAMEWORK_NAME}.xcworkspace\" -scheme \"${FRAMEWORK_NAME}\" ONLY_ACTIVE_ARCH=NO -configuration ${CONFIGURATION} -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' BUILD_DIR=\"${BUILD_DIR}\" BUILD_ROOT=\"${BUILD_ROOT}\" || exit 1\n\n\n######################\n# Create directory for universal\n######################\n\nrm -rf \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${UNIVERSAL_LIBRARY_DIR}\"\n\nmkdir \"${FRAMEWORK}\"\n\n\n######################\n# Copy files Framework\n######################\n\ncp -r \"${DEVICE_LIBRARY_PATH}/.\" \"${FRAMEWORK}\"\n\n\n######################\n# Make an universal binary\n######################\n\nset -o pipefail\nlipo \"${SIMULATOR_LIBRARY_PATH}/${FRAMEWORK_NAME}\" \"${DEVICE_LIBRARY_PATH}/${FRAMEWORK_NAME}\" -create -output \"${FRAMEWORK}/${FRAMEWORK_NAME}\" | echo || exit 1\n\n#rm -rf ${FRAMEWORK}/libswiftRemoteMirror.dylib\n#\n## For Swift framework, Swiftmodule needs to be copied in the universal framework\n#if [ -d \"${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" ]; then\n#cp -f ${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* \"${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" | echo\n#fi\n#\n#if [ -d \"${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" ]; then\n#cp -f ${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* \"${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/\" | echo\n#fi\n\nif [ -n \"${WORKSPACE}\" ]; then\ncp -r \"${FRAMEWORK}\" \"${WORKSPACE}\"\nelif [ ${REVEAL_ARCHIVE_IN_FINDER} = true ]; then\nopen \"${UNIVERSAL_LIBRARY_DIR}/\"\nfi";
};
B6A4B80042EEEDC9F68AA276 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
21 changes: 11 additions & 10 deletions AuthorizeNetAccept.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@

Pod::Spec.new do |s|

s.name = 'AuthorizeNetAccept'
s.authors = 'Authorize.Net'
s.version = '0.0.4'
s.summary = 'Authorize.Net Accept SDK for iOS'
s.homepage = 'https://developer.authorize.net'
s.name = 'AuthorizeNetAccept'
s.authors = 'Authorize.Net'
s.version = '0.0.5'
s.summary = 'Authorize.Net Accept SDK for iOS'
s.homepage = 'https://developer.authorize.net'

s.license = 'https://github.com/AuthorizeNet/accept-sdk-ios/blob/master/LICENSE.md'
s.platform = :ios, "8.4"
s.license = 'https://github.com/AuthorizeNet/accept-sdk-ios/blob/master/LICENSE.md'
s.platform = :ios, "8.4"

s.source = {:git => 'https://github.com/AuthorizeNet/accept-sdk-ios.git', :tag => s.version.to_s}
s.source = {:git => 'https://github.com/AuthorizeNet/accept-sdk-ios.git', :tag => s.version.to_s}
s.user_target_xcconfig = { "EMBEDDED_CONTENT_CONTAINS_SWIFT" => "YES", "CLANG_MODULES_AUTOLINK" => "YES" }

s.requires_arc = true

s.module_name = 'AuthorizeNetAccept'
s.vendored_framework = 'AcceptSDK-Framework/AcceptSDK.framework'
s.module_name = 'AuthorizeNetAccept'
s.vendored_framework = 'AcceptSDK-Framework/AcceptSDK.framework'

end

16 changes: 8 additions & 8 deletions createUniversalArchive.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ cp -r "${DEVICE_LIBRARY_PATH}/." "${FRAMEWORK}"
set -o pipefail
lipo "${SIMULATOR_LIBRARY_PATH}/${FRAMEWORK_NAME}" "${DEVICE_LIBRARY_PATH}/${FRAMEWORK_NAME}" -create -output "${FRAMEWORK}/${FRAMEWORK_NAME}" | echo || exit 1

# For Swift framework, Swiftmodule needs to be copied in the universal framework
if [ -d "${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/" ]; then
cp -f ${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* "${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/" | echo
fi

if [ -d "${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/" ]; then
cp -f ${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* "${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/" | echo
fi
## For Swift framework, Swiftmodule needs to be copied in the universal framework
#if [ -d "${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/" ]; then
#cp -f ${SIMULATOR_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* "${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/" | echo
#fi
#
#if [ -d "${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/" ]; then
#cp -f ${DEVICE_LIBRARY_PATH}/Modules/${FRAMEWORK_NAME}.swiftmodule/* "${FRAMEWORK}/Modules/${FRAMEWORK_NAME}.swiftmodule/" | echo
#fi

if [ -n "${WORKSPACE}" ]; then
cp -r "${FRAMEWORK}" "${WORKSPACE}"
Expand Down

0 comments on commit 452b769

Please sign in to comment.