[pull] master from Carthage:master

.swiftlint.yml

@@ -22,6 +22,8 @@ disabled_rules:
 - no_fallthrough_only # https://github.com/realm/SwiftLint/issues/2276
 - redundant_string_enum_value
 - superfluous_disable_command
+- large_tuple
+- switch_case_on_newline
 
 included:
 - Source

.travis.yml

@@ -5,6 +5,8 @@ cache:
   directories:
     - .build/checkouts # SwiftPM
     - .build/repositories # SwiftPM
+    - script # With Travis’ macOS specifics in the following link, the below no longer launches any Travis runs: https://www.travis-ci.com/blog/2020-11-02-travis-ci-new-billing/
+    - Logo # For our future use on other CI platforms, I’ve included `for_use_during_unit_testing_for_carthage_on_intel_host_os.xcconfig` scripting.
 branches:
   only:
     - master
@@ -14,6 +16,8 @@ matrix:
       language: objective-c
       osx_image: xcode10.1
       script:
+        - echo 'NON_BLANK_FOR_XCODE_VERSION_MAJOR_0100=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0200=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0300=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0400=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0500=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0600=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0700=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0800=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0900=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_1000=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_1100=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0000=YES•THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER=$(NON_BLANK_FOR_XCODE_VERSION_MAJOR_$(XCODE_VERSION_MAJOR))•EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER___NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8•EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER_$(THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))' | tr • '\n' | tee ~/for_use_during_unit_testing_for_carthage_on_intel_host_os.xcconfig
+        - export XCODE_XCCONFIG_FILE=~/for_use_during_unit_testing_for_carthage_on_intel_host_os.xcconfig
         - make test
       env: JOB=CI_TEST_10_1
     - os: osx
@@ -23,6 +27,8 @@ matrix:
         - brew uninstall carthage
         - HOMEBREW_NO_AUTO_UPDATE=1 brew install bats
         - make install
+        - echo 'NON_BLANK_FOR_XCODE_VERSION_MAJOR_0100=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0200=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0300=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0400=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0500=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0600=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0700=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0800=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0900=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_1000=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_1100=YES•NON_BLANK_FOR_XCODE_VERSION_MAJOR_0000=YES•THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER=$(NON_BLANK_FOR_XCODE_VERSION_MAJOR_$(XCODE_VERSION_MAJOR))•EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER___NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8•EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER_$(THIS_SPOT_LEFT_BLANK_IF_XCODE_12_OR_HIGHER)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))' | tr • '\n' | tee ~/for_use_during_unit_testing_for_carthage_on_intel_host_os.xcconfig
+        - export XCODE_XCCONFIG_FILE=~/for_use_during_unit_testing_for_carthage_on_intel_host_os.xcconfig
         - bats IntegrationTests
       env:
         - JOB=CI_INTEGRATION_TESTS

Documentation/Artifacts.md

@@ -148,12 +148,22 @@ For dependencies that do not have source code available, a binary project specif
 * The version **must** be a semantic version.  Git branches, tags and commits are not valid.
 * The location **must** be an `https` url.
 
+#### Publish an XCFramework build alongside the framework build using an `alt=` query parameter
+
+To support users who build with `--use-xcframework`, create two zips: one containing the framework bundle(s) for your dependency, the other containing xcframework(s). Include "framework" or "xcframework" in the names of the zips, for example:  `MyFramework.framework.zip` and `MyFramework.xcframework.zip`. In your project specification, join the two URLs into one using a query string:
+
+	https://my.domain.com/release/1.0.0/MyFramework.framework.zip?alt=https://my.domain.com/release/1.0.0/MyFramework.xcframework.zip
+
+Starting in version 0.38.0, Carthage extracts any `alt=` URLs from the version specification. When `--use-xcframeworks` is passed, it prefers downloading URLs with "xcframework" in the name.
+
+**For backwards compatibility,** provide the plain frameworks build _first_ (i.e. not as an alt URL), so that older versions of Carthage use it. Carthage versions prior to 0.38.0 fail to download and extract XCFrameworks.
+
 #### Example binary project specification
 
 ```
 {
 	"1.0": "https://my.domain.com/release/1.0.0/framework.zip",
-	"1.0.1": "https://my.domain.com/release/1.0.1/framework.zip"
+	"1.0.1": "https://my.domain.com/release/1.0.1/MyFramework.framework.zip?alt=https://my.domain.com/release/1.0.1/MyFramework.xcframework.zip"
 }
 
 ```

Documentation/Xcode12Workaround.md

@@ -0,0 +1,59 @@
+# Using Carthage with Xcode 12
+
+As Carthage doesn't work out of the box with Xcode 12, this document will guide through a workaround that works for most cases.
+
+## Why Carthage compilation fails
+
+Well, shortly, Carthage builds fat frameworks, which means that the framework contains binaries for all supported architectures. 
+Until Apple Silicon was introduced it all worked just fine, but now there is a conflict as there are duplicate architectures (arm64 for devices and arm64 for simulator).
+This means that Carthage cannot link architecture specific frameworks to a single fat framework.
+
+You can find more info in [respective issue #3019](https://github.com/Carthage/Carthage/issues/3019).
+
+## Workaround 
+
+As a workaround you can invoke carthage using this script, it will remove the arm64 architecture for simulator, so the above mentioned conflict doesn't exist.
+
+## How to make it work
+
+1. place this script somewhere to your `PATH` (I personally have it in `/usr/local/bin/carthage.sh`)
+2. make it the script executable, so open your _Terminal_ and run 
+   ```bash
+   chmod +x /usr/local/bin/carthage.sh
+   ```
+3. from now on instead of running e.g. 
+   ```
+   carthage bootstrap --platform iOS --cache-builds
+   ```
+   you need to run our script
+   ```
+   carthage.sh bootstrap --platform iOS --cache-builds
+   ```
+
+### Workaround script
+
+This script has a known limitation - it will remove arm64 simulator architecture from compiled framework, so frameworks compiled using it cannot be used on Macs running Apple Silicon.
+
+```bash
+# 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 "Xcode" | cut -d' ' -f2 | cut -d'.' -f1)00"
+CURRENT_XCODE_BUILD=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
+
+echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_${CURRENT_XCODE_VERSION}__BUILD_${CURRENT_XCODE_BUILD} = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig
+
+echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_'${CURRENT_XCODE_VERSION}' = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_$(XCODE_VERSION_MAJOR)__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 "$@"
+```

ISSUE_TEMPLATE.md

@@ -7,6 +7,7 @@
 * Are you using `--use-submodules`? 
 * Are you using `--cache-builds`? 
 * Are you using `--new-resolver`? 
+* Are you using `--use-xcframeworks`? 
 
 **Cartfile**
 ```

IntegrationTests/copy-frameworks.bats

@@ -15,7 +15,7 @@ teardown() {
     run carthage update --platform ios
     [ "$status" -eq 0 ]
 
-    run xcodebuild clean build-for-testing -scheme CarthageCopyFrameworksFixture -sdk iphonesimulator -destination "name=iPhone 6s"
+    run xcodebuild clean build-for-testing -scheme CarthageCopyFrameworksFixture -sdk iphonesimulator -destination "name=iPhone 8"
     [ "$status" -eq 0 ]
 
     ARCHIVE_APP_DIR=CarthageCopyFrameworksFixture.xcarchive/Products/Applications

IntegrationTests/relink-conflicting-not-checked-in-symlink.bats

@@ -72,3 +72,24 @@ carthage-and-check-project-symlink() {
 	carthage-and-check-project-symlink update --no-build --no-use-binaries
 
 }
+
+@test "with conflicting not-checked-in symlink in «Carthage/Checkouts» of dependency pathologically named «...git», carthage «bootstrap, update, update» should — sanitizing throughout — unlink, then write symlink there" {
+
+	mv "${extracted_directory:?}/SourceRepos/TestFramework1" "${extracted_directory}/SourceRepos/...git"
+
+	rm Cartfile
+
+	cat > Cartfile <<-EOF
+		git "file://${extracted_directory}/SourceRepos/...git" "relink-conflicting-not-checked-in-syminks"
+	EOF
+
+	carthage bootstrap --no-build --no-use-binaries
+	check-symlink "$(project_directory)/Carthage/Checkouts/．．/Carthage/Checkouts/TestFramework2"
+	# carthage should have sanitized the former «TestFramework1» from «...git» to non–path-traversing «．．»…
+
+	carthage update --no-build --no-use-binaries
+	check-symlink "$(project_directory)/Carthage/Checkouts/．．/Carthage/Checkouts/TestFramework2"
+
+	carthage update --no-build --no-use-binaries
+	check-symlink "$(project_directory)/Carthage/Checkouts/．．/Carthage/Checkouts/TestFramework2"
+}

Makefile

@@ -1,38 +1,50 @@
 #!/usr/bin/xcrun make -f
 
 CARTHAGE_TEMPORARY_FOLDER?=/tmp/Carthage.dst
+export CARTHAGE_TEMPORARY_FOLDER
 PREFIX?=/usr/local
+export PREFIX
 
 INTERNAL_PACKAGE=CarthageApp.pkg
 OUTPUT_PACKAGE=Carthage.pkg
 
 CARTHAGE_EXECUTABLE=./.build/release/carthage
-BINARIES_FOLDER=/usr/local/bin
+BINARIES_FOLDER=$(PREFIX)/bin
+export BINARIES_FOLDER
 
 SWIFT_BUILD_FLAGS=--configuration release -Xswiftc -suppress-warnings
+SWIFT_TEST_FLAGS=--skip-update
 
 SWIFTPM_DISABLE_SANDBOX_SHOULD_BE_FLAGGED:=$(shell test -n "$${HOMEBREW_SDKROOT}" && echo should_be_flagged)
 ifeq ($(SWIFTPM_DISABLE_SANDBOX_SHOULD_BE_FLAGGED), should_be_flagged)
 SWIFT_BUILD_FLAGS+= --disable-sandbox
 endif
-SWIFT_STATIC_STDLIB_SHOULD_BE_FLAGGED:=$(shell test -d $$(dirname $$(xcrun --find swift))/../lib/swift_static/macosx && echo should_be_flagged)
+SWIFT_BUILD_SHOULD_BE_FLAGGED_VERY_VERBOSE:=$(shell (/usr/bin/xcrun --find swift-package | /bin/zsh --no-globalrcs --no-rcs -c '/usr/bin/strings "$$(cat)"' | grep --quiet -e '^veryVerbose') && echo should_be_flagged)
+ifeq ($(SWIFT_BUILD_SHOULD_BE_FLAGGED_VERY_VERBOSE), should_be_flagged)
+SWIFT_BUILD_FLAGS+= --very-verbose
+SWIFT_TEST_FLAGS+= --very-verbose
+endif
+SWIFT_STATIC_STDLIB_SHOULD_BE_FLAGGED:=$(shell test -d $$(dirname $$(xcrun --find swift))/../lib/swift_static/macosx && (./script/strings_of_xcrun_find_ld.zsh | grep --quiet -e '^only one snapshot supported') && echo should_be_flagged)
 ifeq ($(SWIFT_STATIC_STDLIB_SHOULD_BE_FLAGGED), should_be_flagged)
 SWIFT_BUILD_FLAGS+= -Xswiftc -static-stdlib
 endif
 
 # ZSH_COMMAND · run single command in `zsh` shell, ignoring most `zsh` startup files.
-ZSH_COMMAND := ZDOTDIR='/var/empty' zsh -o NO_GLOBAL_RCS -c
+ZSH_COMMAND = ZDOTDIR='/var/empty' zsh --no-globalrcs --no-rcs -c
 # RM_SAFELY · `rm -rf` ensuring first and only parameter is non-null, contains more than whitespace, non-root if resolving absolutely.
-RM_SAFELY := $(ZSH_COMMAND) '[[ ! $${1:?} =~ "^[[:space:]]+\$$" ]] && [[ $${1:A} != "/" ]] && [[ $${\#} == "1" ]] && noglob rm -rf $${1:A}' --
+RM_SAFELY = $(ZSH_COMMAND) '[[ ! $${1:?} =~ "^[[:space:]]+\$$" ]] && [[ $${1:A} != "/" ]] && [[ $${\#} == "1" ]] && noglob rm -rf $${1:A}' --
 
 VERSION_STRING=$(shell git describe --abbrev=0 --tags)
 DISTRIBUTION_PLIST=Source/carthage/Distribution.plist
 
 RM=rm -f
-MKDIR=mkdir -p
 SUDO=sudo
 CP=cp
 
+ifdef DISABLE_SUDO
+override SUDO=
+endif
+
 .PHONY: all clean install package test uninstall xcconfig xcodeproj
 
 all: installables
@@ -46,19 +58,20 @@ test:
 	$(CP) -R Tests/CarthageKitTests/Resources ./.build/debug/CarthagePackageTests.xctest/Contents
 	$(CP) Tests/CarthageKitTests/fixtures/CartfilePrivateOnly.zip ./.build/debug/CarthagePackageTests.xctest/Contents/Resources
 	script/copy-fixtures ./.build/debug/CarthagePackageTests.xctest/Contents/Resources
-	swift test --skip-build
+	swift test --skip-build $(SWIFT_TEST_FLAGS)
 
 installables:
 	swift build $(SWIFT_BUILD_FLAGS)
+	/bin/zsh --no-globalrcs --no-rcs -c 'set -x; print -r "$${CARTHAGE_TEMPORARY_FOLDER:?}$${BINARIES_FOLDER:?}"'
 
 package: installables
-	$(MKDIR) "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)"
-	$(CP) "$(CARTHAGE_EXECUTABLE)" "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)"
+	/bin/zsh --no-globalrcs --no-rcs -c 'set -x; mkdir -p "$${CARTHAGE_TEMPORARY_FOLDER:?}$${BINARIES_FOLDER:?}"'
+	$(CP) -v "$(CARTHAGE_EXECUTABLE)" "$${CARTHAGE_TEMPORARY_FOLDER:?}$${BINARIES_FOLDER:?}"
 
 	pkgbuild \
 		--identifier "org.carthage.carthage" \
 		--install-location "/" \
-		--root "$(CARTHAGE_TEMPORARY_FOLDER)" \
+		--root "$${CARTHAGE_TEMPORARY_FOLDER:?}" \
 		--version "$(VERSION_STRING)" \
 		"$(INTERNAL_PACKAGE)"
 
@@ -68,14 +81,15 @@ package: installables
 	   	"$(OUTPUT_PACKAGE)"
 
 prefix_install: installables
-	$(MKDIR) "$(PREFIX)/bin"
-	$(CP) -f "$(CARTHAGE_EXECUTABLE)" "$(PREFIX)/bin/"
+	/bin/zsh --no-globalrcs --no-rcs -c 'set -x; mkdir -p "$${BINARIES_FOLDER:?}"'
+	$(CP) -v -f "$(CARTHAGE_EXECUTABLE)" "$${BINARIES_FOLDER:?}"
 
 install: installables
-	$(SUDO) $(CP) -f "$(CARTHAGE_EXECUTABLE)" "$(BINARIES_FOLDER)"
+	if [ ! -d "$${BINARIES_FOLDER:?}" ]; then $(SUDO) mkdir -p "$${BINARIES_FOLDER:?}"; fi
+	$(SUDO) $(CP) -v -f "$(CARTHAGE_EXECUTABLE)" "$${BINARIES_FOLDER:?}"
 
 uninstall:
-	$(RM) "$(BINARIES_FOLDER)/carthage"
+	/bin/zsh --no-globalrcs --no-rcs -c 'set -x; rm -f -v "$${BINARIES_FOLDER:?}/carthage"'
 
 xcodeproj:
 	 swift package generate-xcodeproj

Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/Quick/Nimble.git",
         "state": {
           "branch": null,
-          "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
-          "version": "8.0.2"
+          "revision": "7a46a5fc86cb917f69e3daf79fcb045283d8f008",
+          "version": "8.1.2"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/Quick/Quick.git",
         "state": {
           "branch": null,
-          "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
-          "version": "2.1.0"
+          "revision": "09b3becb37cb2163919a3842a4c5fa6ec7130792",
+          "version": "2.2.1"
         }
       },
       {

Package.swift

@@ -16,8 +16,8 @@ let package = Package(
         .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0"),
         .package(url: "https://github.com/mdiep/Tentacle.git", from: "0.13.1"),
         .package(url: "https://github.com/thoughtbot/Curry.git", from: "4.0.2"),
-        .package(url: "https://github.com/Quick/Quick.git", from: "2.1.0"),
-        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.1"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "2.2.1"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.9"),
     ],
     targets: [
         .target(