diff --git a/.jazzy.yaml b/.jazzy.yaml index 6fa59613..90e1a3cb 100644 --- a/.jazzy.yaml +++ b/.jazzy.yaml @@ -1,10 +1,10 @@ -# Run: sourcekitten doc --spm-module SWCompression > docs.json +# Run: sourcekitten doc --spm --module-name SWCompression > docs.json sourcekitten_sourcefile: docs.json clean: true author: Timofey Solomko module: SWCompression -module_version: 4.5.7 -copyright: '© 2020 Timofey Solomko' +module_version: 4.5.8 +copyright: '© 2021 Timofey Solomko' readme: README.md github_url: https://github.com/tsolomko/SWCompression github_file_prefix: https://github.com/tsolomko/SWCompression/tree/4.5.7 diff --git a/.travis.yml b/.travis.yml index 70ec0b36..ce7ad876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ jobs: script: - ./utils.py ci script-macos - stage: test + # TODO: Remove this stage when the non-xcf installation method with Carthage is no longer supported. language: swift os: osx osx_image: xcode12 # Swift 5.3 @@ -58,8 +59,6 @@ jobs: install: - ./utils.py ci install-macos before_script: - # - ./utils.py prepare-workspace macos - # TODO: Remove lines below when Carthage gets a workaround for problems with Xcode 12 - xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) - trap 'rm -f "$xcconfig"' INT TERM HUP EXIT - echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig @@ -67,8 +66,30 @@ jobs: - export XCODE_XCCONFIG_FILE="$xcconfig" - carthage bootstrap - git submodule update --init --recursive - - cp -f Tests/Test Files/gitattributes-copy Tests/Test Files/.gitattributes - - cd Tests/Test Files/ + - cp "Tests/Test Files/gitattributes-copy" "Tests/Test Files/.gitattributes" + - cd "Tests/Test Files/" + - git lfs pull + - git lfs checkout + - cd - + script: + - ./utils.py ci script-macos + - stage: test + language: swift + os: osx + osx_image: xcode12.4 # Swift 5.3.2 + env: + - HOMEBREW_NO_INSTALL_CLEANUP=1 + before_install: + - brew update + install: + - ./utils.py ci install-macos + before_script: + # TODO: Move this line into ./utils.py prepare-workspace macos when the old Swift versions and non-xcf installation + # method with Carthage are no longer supported. + - carthage bootstrap --use-xcframeworks --no-use-binaries + - git submodule update --init --recursive + - cp "Tests/Test Files/gitattributes-copy" "Tests/Test Files/.gitattributes" + - cd "Tests/Test Files/" - git lfs pull - git lfs checkout - cd - @@ -79,7 +100,7 @@ jobs: os: linux dist: xenial env: - - SWIFT_VERSION=4.2 + - SWIFT_VERSION=4.2.3 install: - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" script: @@ -89,7 +110,7 @@ jobs: os: linux dist: xenial env: - - SWIFT_VERSION=5.0 + - SWIFT_VERSION=5.0.3 install: - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" script: @@ -99,7 +120,7 @@ jobs: os: linux dist: xenial env: - - SWIFT_VERSION=5.1 + - SWIFT_VERSION=5.1.5 install: - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" script: @@ -109,7 +130,7 @@ jobs: os: linux dist: xenial env: - - SWIFT_VERSION=5.2 + - SWIFT_VERSION=5.2.5 install: - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" script: @@ -119,16 +140,17 @@ jobs: os: linux dist: xenial env: - - SWIFT_VERSION=5.3 + - SWIFT_VERSION=5.3.3 install: - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" script: - ./utils.py ci script-linux - stage: deploy - if: tag IS present + # Don't deploy if it is a test release. + if: (tag IS present) AND (tag =~ /^\d+\.\d+\.\d+$/) language: generic os: osx - osx_image: xcode11.4 + osx_image: xcode12 env: - HOMEBREW_NO_INSTALL_CLEANUP=1 env: @@ -136,31 +158,15 @@ jobs: addons: homebrew: packages: - - carthage - sourcekitten update: true install: - gem install -N jazzy - gem update -N cocoapods before_deploy: - - > - if ! [ "$BEFORE_DEPLOY_RUN" ]; then - export BEFORE_DEPLOY_RUN=1; - ./utils.py prepare-workspace macos -T - ./utils.py ci before-deploy; - fi + - ./utils.py ci before-deploy deploy: - - provider: releases - skip_cleanup: true - api_key: $GITHUB_TOKEN - file: "SWCompression.framework.zip" - on: - tags: true - provider: pages skip_cleanup: true github_token: $GITHUB_TOKEN local_dir: docs - on: - tags: true - # Don't upload documentation if it is a test release. - condition: $(git describe) != *"test"* diff --git a/CHANGELOG.md b/CHANGELOG.md index 269a0fd7..e4767c8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 4.5.8 + +- Fixed incompatibility with Carthage `--use-xcframeworks` method of installation. + ## 4.5.7 - Fixed a crash when trying to open a very small file as a 7-Zip container, a BZip2 "archive", a GZip archive (both when diff --git a/LICENSE b/LICENSE index 536dba60..005f75c9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Timofey Solomko +Copyright (c) 2021 Timofey Solomko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f115dafd..e7e589cc 100644 --- a/README.md +++ b/README.md @@ -104,17 +104,25 @@ BZip2 and LZMA/LZMA2 support). ### Carthage -__Important:__ Only Swift 5.x is supported when installing BitByteData via Carthage. +__Important:__ Only Swift 5.x is supported when installing SWCompression via Carthage. Add to your Cartfile `github "tsolomko/SWCompression" ~> 4.5`. -Then run `carthage update`. +Then: -Finally, drag and drop `SWCompression.framework` from the `Carthage/Build` directory into the "Embedded Binaries" section -on your targets' "General" tab in Xcode. +1. If you use Xcode 12 or later you should run `carthage update --use-xcframeworks --no-use-binaries`. After that drag +and drop both `SWCompression.xcframework` and `BitByteData.xcframework` files from from the `Carthage/Build/` directory +into the "Frameworks, Libraries, and Embedded Content" section of your target's "General" tab in Xcode. -SWCompression uses [BitByteData](https://github.com/tsolomko/BitByteData) framework, so Carthage will also download it, -and you should put the `BitByteData.framework` file into the "Embedded Binaries" as well. +2. If you use Xcode 11 or earlier you should run `carthage update --no-use-binaries`. After that drag and drop both +`SWCompression.framework` and `BitByteData.framework` files from from the `Carthage/Build//` directory into the +"Embedded Binaries" section of your target's "General" tab in Xcode. + +For Xcode 12 or later you can currently also use the +[xconfig workaround](https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md). + +Please also note that support for non-xcframework method of installing SWCompression is likely to be dropped in the +future major update. ## Usage @@ -186,6 +194,13 @@ If you want to run tests on your computer, you need to do an additional step aft The argument of this function is an operating system that you're using. This command will download files used in tests, and on macOS it will also try to download BitByteData dependency, which requires having Carthage installed. +Currently, the Carthage part of this procedure may fail when using Xcode 12 or later. In that case you should manually +run `carthage update --use-xcframeworks --no-use-binaries` or use +[xconfig workaround](https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md). Please also +note that when on working on SWCompression in Xcode when building the project you may see ld warnings about a directory +not being found. These are expected and harmless. Finally, you should keep in mind that support for non-xcframework method +of installing dependencies is likely to be dropped in the future major update. + Test files are stored in a [separate repository](https://github.com/tsolomko/SWCompression-Test-Files), using Git LFS. There are two reasons for this complicated setup. Firstly, some of these files can be quite big, and it would be unfortunate if the users of SWCompression had to download them every time during the installation. Secondly, Swift diff --git a/SWCompression.podspec b/SWCompression.podspec index 7333c861..ac193438 100644 --- a/SWCompression.podspec +++ b/SWCompression.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SWCompression" - s.version = "4.5.7" + s.version = "4.5.8" s.summary = "A framework with functions for working with compression, archives and containers." s.description = "A framework with (de)compression algorithms and functions for processing various archives and containers." diff --git a/SWCompression.xcodeproj/SWCompression.plist b/SWCompression.xcodeproj/SWCompression.plist index 46a41309..38b0f04e 100644 --- a/SWCompression.xcodeproj/SWCompression.plist +++ b/SWCompression.xcodeproj/SWCompression.plist @@ -15,10 +15,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.5.7 + 4.5.8 CFBundleVersion - 74 + 75 NSHumanReadableCopyright - Copyright © 2020 Timofey Solomko. All rights reserved. + Copyright © 2021 Timofey Solomko. All rights reserved. diff --git a/SWCompression.xcodeproj/TestSWCompression.plist b/SWCompression.xcodeproj/TestSWCompression.plist index a8ecec80..00e0c5d4 100644 --- a/SWCompression.xcodeproj/TestSWCompression.plist +++ b/SWCompression.xcodeproj/TestSWCompression.plist @@ -15,8 +15,8 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 4.5.7 + 4.5.8 CFBundleVersion - 74 + 75 diff --git a/SWCompression.xcodeproj/project.pbxproj b/SWCompression.xcodeproj/project.pbxproj index bd38906a..249fea7d 100644 --- a/SWCompression.xcodeproj/project.pbxproj +++ b/SWCompression.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -934,7 +934,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1240; ORGANIZATIONNAME = "Timofey Solomko"; TargetAttributes = { 06BE1AC71DB410F100EE0F59 = { @@ -948,7 +948,7 @@ }; }; buildConfigurationList = 06BE1AC21DB410F100EE0F59 /* Build configuration list for PBXProject "SWCompression" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -1090,7 +1090,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "if [[ ${SDK_NAME} == iphone* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n cp -a ${PROJECT_DIR}/Carthage/Build/iOS/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\nelif [[ ${SDK_NAME} == appletv* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n cp -a ${PROJECT_DIR}/Carthage/Build/tvOS/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\nelif [[ ${SDK_NAME} == watch* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n cp -a ${PROJECT_DIR}/Carthage/Build/watchOS/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\nelif [[ ${SDK_NAME} == macos* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/\n fi\n cp -a ${PROJECT_DIR}/Carthage/Build/Mac/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/\nfi\n\nxattr -rc ${BUILT_PRODUCTS_DIR}\n"; + shellScript = "if [[ ${SDK_NAME} == iphone* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n if [[ -d ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/ ]]; then\n if [[ ${SDK_NAME} == iphonesimulator* ]]; then\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/ios-*-simulator/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/ios-arm64_armv7/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/iOS/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\nelif [[ ${SDK_NAME} == appletv* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n if [[ -d ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/ ]]; then\n if [[ ${SDK_NAME} == appletvsimulator* ]]; then\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/tvos-*-simulator/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/tvos-arm64/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/tvOS/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\nelif [[ ${SDK_NAME} == watch* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n if [[ -d ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/ ]]; then\n if [[ ${SDK_NAME} == watchossimulator* ]]; then\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/watchos-*-simulator/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/watchos-arm64_32_armv7k/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/watchOS/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Frameworks/\n fi\nelif [[ ${SDK_NAME} == macos* ]]; then\n if [[ ! -d ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/ ]]; then\n mkdir -p ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/\n fi\n if [[ -d ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/ ]]; then\n cp -a ${PROJECT_DIR}/Carthage/Build/BitByteData.xcframework/macos-*/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/\n else\n cp -a ${PROJECT_DIR}/Carthage/Build/Mac/BitByteData.framework ${BUILT_PRODUCTS_DIR}/TestSWCompression.xctest/Contents/Frameworks/\n fi\nfi\n\nxattr -rc ${BUILT_PRODUCTS_DIR}\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -1244,22 +1244,44 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 74; + CURRENT_PROJECT_VERSION = 75; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = "\"$(SRCROOT)/Carthage/Build/tvOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = "\"$(SRCROOT)/Carthage/Build/tvOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = "\"$(SRCROOT)/Carthage/Build/iOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = "\"$(SRCROOT)/Carthage/Build/iOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "\"$(SRCROOT)/Carthage/Build/Mac\""; - "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = "\"$(SRCROOT)/Carthage/Build/watchOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = "\"$(SRCROOT)/Carthage/Build/watchOS\""; + "FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = ( + "\"$(SRCROOT)/Carthage/Build/tvOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/tvos-arm64\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = ( + "\"$(SRCROOT)/Carthage/Build/tvOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/tvos-arm64_x86_64-simulator\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( + "\"$(SRCROOT)/Carthage/Build/iOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/ios-arm64_armv7\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "\"$(SRCROOT)/Carthage/Build/iOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/ios-arm64_i386_x86_64-simulator\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "\"$(SRCROOT)/Carthage/Build/Mac\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/macos-arm64_x86_64\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = ( + "\"$(SRCROOT)/Carthage/Build/watchOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/watchos-arm64_32_armv7k\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = ( + "\"$(SRCROOT)/Carthage/Build/watchOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/watchos-arm64_i386_x86_64-simulator\"", + ); GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1303,21 +1325,43 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CURRENT_PROJECT_VERSION = 74; + CURRENT_PROJECT_VERSION = 75; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - "FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = "\"$(SRCROOT)/Carthage/Build/tvOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = "\"$(SRCROOT)/Carthage/Build/tvOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = "\"$(SRCROOT)/Carthage/Build/iOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = "\"$(SRCROOT)/Carthage/Build/iOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = "\"$(SRCROOT)/Carthage/Build/Mac\""; - "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = "\"$(SRCROOT)/Carthage/Build/watchOS\""; - "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = "\"$(SRCROOT)/Carthage/Build/watchOS\""; + "FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = ( + "\"$(SRCROOT)/Carthage/Build/tvOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/tvos-arm64\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=appletvsimulator*]" = ( + "\"$(SRCROOT)/Carthage/Build/tvOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/tvos-arm64_x86_64-simulator\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphoneos*]" = ( + "\"$(SRCROOT)/Carthage/Build/iOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/ios-arm64_armv7\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "\"$(SRCROOT)/Carthage/Build/iOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/ios-arm64_i386_x86_64-simulator\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = ( + "\"$(SRCROOT)/Carthage/Build/Mac\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/macos-arm64_x86_64\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=watchos*]" = ( + "\"$(SRCROOT)/Carthage/Build/watchOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/watchos-arm64_32_armv7k\"", + ); + "FRAMEWORK_SEARCH_PATHS[sdk=watchsimulator*]" = ( + "\"$(SRCROOT)/Carthage/Build/watchOS\"", + "\"$(SRCROOT)/Carthage/Build/BitByteData.xcframework/watchos-arm64_i386_x86_64-simulator\"", + ); GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1348,7 +1392,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 74; + DYLIB_CURRENT_VERSION = 75; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = SWCompression.xcodeproj/SWCompression.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1375,7 +1419,7 @@ APPLICATION_EXTENSION_API_ONLY = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 74; + DYLIB_CURRENT_VERSION = 75; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = SWCompression.xcodeproj/SWCompression.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; diff --git a/SWCompression.xcodeproj/xcshareddata/xcschemes/SWCompression.xcscheme b/SWCompression.xcodeproj/xcshareddata/xcschemes/SWCompression.xcscheme index 0f4b19d0..0987e3ca 100644 --- a/SWCompression.xcodeproj/xcshareddata/xcschemes/SWCompression.xcscheme +++ b/SWCompression.xcodeproj/xcshareddata/xcschemes/SWCompression.xcscheme @@ -1,6 +1,6 @@ + + + + - - - - - - - - Removing bcsymbolmap files for dependencies.") - platforms = ["Mac", "watchOS", "tvOS", "iOS"] - for platform in platforms: - _sprun(["rm", "-f", "Carthage/Build/{0}/*.bcsymbolmap".format(platform)]) - print("=> Removing checkouts for dependencies.") - _sprun(["rm", "-rf", "Carthage/Checkouts"]) - print("=> Preparing deployment files.") - _sprun(["carthage", "build", "--no-skip-current"]) - _sprun(["carthage", "archive", "SWCompression"]) docs_json_file = open("docs.json", "w") - _sprun(["sourcekitten", "doc", "--spm-module", "SWCompression"], stdout=docs_json_file) + _sprun(["sourcekitten", "doc", "--spm", "--module-name", "SWCompression"], stdout=docs_json_file) docs_json_file.close() _sprun(["jazzy"]) @@ -71,7 +62,7 @@ def action_cw(args): def _pw_macos(): print("=> Downloading dependency (BitByteData) using Carthage") - _sprun(["carthage", "bootstrap"]) + _sprun(["carthage", "bootstrap", "--no-use-binaries"]) def action_pw(args): if args.os == "macos": @@ -83,7 +74,7 @@ def action_pw(args): if not args.no_test_files: print("=> Downloading files used for testing") _sprun(["git", "submodule", "update", "--init", "--recursive"]) - _sprun(["cp", "-f", "Tests/Test Files/gitattributes-copy", "Tests/Test Files/.gitattributes"]) + _sprun(["cp", "Tests/Test Files/gitattributes-copy", "Tests/Test Files/.gitattributes"]) _sprun(["git", "lfs", "pull"], cwd="Tests/Test Files/") _sprun(["git", "lfs", "checkout"], cwd="Tests/Test Files/")