Carthage update (No ARM64)

charlymr · Aug 2, 2021 · b80b740 · b80b740
1 parent 7967010
commit b80b740
Show file tree

Hide file tree

Showing 15 changed files with 300 additions and 241 deletions.
diff --git a/Carthage/Build/.XlsxReaderWriter.version b/Carthage/Build/.XlsxReaderWriter.version
diff --git a/Carthage/Build/.ZipArchive.version b/Carthage/Build/.ZipArchive.version
diff --git a/Carthage/Build/tvOS/ZipArchive.framework/ZipArchive b/Carthage/Build/tvOS/ZipArchive.framework/ZipArchive
diff --git a/Carthage/Build/watchOS/ZipArchive.framework/Headers/ZipArchive.h b/Carthage/Build/watchOS/ZipArchive.framework/Headers/ZipArchive.h
diff --git a/Demo/Cartfile b/Demo/Cartfile
@@ -2,7  2,7 @@
 github "ZipArchive/ZipArchive" ~> 2.2
 
 # From Github (Using Tag for sementic versioning)
-github "charlymr/XlsxReaderWriter" ~> 2.4.1
 #github "charlymr/XlsxReaderWriter" ~> 2.4.2
 
 # Local (Using Branch Name)
-#git "../../XlsxReaderWriter" "2.4.1"
 git "../../XlsxReaderWriter" "2.4.2"
diff --git a/Demo/Cartfile.resolved b/Demo/Cartfile.resolved
@@ -1,2  1,2 @@
-github "ZipArchive/ZipArchive" "v2.2.2"
-github "charlymr/XlsxReaderWriter" "2.4.1"
 git "/Users/dm/Repositories/XlsxReaderWriter" "9347c6ff75ab81a58708e460d8839c0a6080b3e5"
 github "ZipArchive/ZipArchive" "v2.4.2"
diff --git a/Demo/carthage.sh b/Demo/carthage.sh
@@ -0,0  1,19 @@
 # carthage.sh
 # Usage example: ./carthage.sh build --platform iOS
 
 set -euo pipefail
 
 xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
 trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
 
 # For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
 # the build will fail on lipo due to duplicate architectures.
 
 CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
 echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig
 
 echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig
 echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
 
 export XCODE_XCCONFIG_FILE="$xcconfig"
 carthage "$@"
diff --git a/Podfile b/Podfile
@@ -14,6  14,12 @@ target 'XlsxReaderWriter-iOS' do
     use_frameworks!
 end
 
 target 'XlsxReaderWriter-Mac' do
     platform :macos, '10.9'
     thridparty
     use_frameworks!
 end
 
 target 'XlsxReaderWriter-WatchOS' do
     platform :watchos, '4.0'
     thridparty

diff --git a/Podfile.lock b/Podfile.lock
@@ -2,7  2,7 @@ PODS:
   - SSZipArchive (2.4.2)
 
 DEPENDENCIES:
-  - SSZipArchive (~> 2.2)
   - SSZipArchive (~> 2.4.2)
 
 SPEC REPOS:
   trunk:
@@ -11,6  11,6 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
 
-PODFILE CHECKSUM: f32bfb89e0f7212ce624407d3795cf3bb749fbc0
 PODFILE CHECKSUM: 6d924de1c9d9214c8d7f6e102ce83ee86f066b6a
 
 COCOAPODS: 1.10.2
diff --git a/README.md b/README.md
@@ -31,6  31,7 @@ import XlsxReaderWriter
 Install [Carthage](https://github.com/Carthage/Carthage#installing-carthage) if not already available 
 
 ## WARNING: Using Carthage with Xcode 12 (No ARM64 arch incliuder - New Mac silicon) please read this:
 ## The zip included for Carthage use the provided carthage.sh file. If you use a New Mac silicon you will need to build
 
 Change to the directory of your Xcode project, and Create and Edit your CartFile and add XlsxReaderWriter:
 [Using Carthage with Xcode 12](https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md)
@@ -40,7  41,7 @@ $ cd /path/to/MyProject
 $ touch CartFile
 $ edit CartFile
 
-github "charlymr/XlsxReaderWriter" ~> 2.4
 github "charlymr/XlsxReaderWriter" ~> 2.4.2
 ```
 
 Save and run:

diff --git a/XlsxReaderWriter.framework.zip b/XlsxReaderWriter.framework.zip