Merge branch 'SDWebImage:master' into master

Author: lapfelix

.github/workflows/CD.yml

@@ -0,0 +1,59 @@
+name: "SDWebImage CD"
+
+on:
+  push:
+    # Pattern matched against refs/tags
+    tags:        
+      - '*'
+
+jobs:
+  Release:
+    name: Release XCFramework
+    runs-on: macos-15
+    env:
+      LC_ALL: en_US.UTF-8
+      CODESIGN_KEY_BASE64: "${{ secrets.CODESIGN_KEY_BASE64 }}"
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app
+      XCODE_VERSION_MAJOR: 1600
+      XCODE_VERSION_MINOR: 1600
+    strategy:
+      fail-fast: true
+      matrix:
+        linkage: [dynamic, static]
+        include:
+          - linkage: dynamic
+            MACH_O_TYPE: mh_dylib
+          - linkage: static
+            MACH_O_TYPE: staticlib
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Build XCFramework
+        run: |
+          set -o pipefail
+          export MACH_O_TYPE="${{ matrix.MACH_O_TYPE }}"
+          ./Scripts/build-frameworks.sh
+          rm -rf ~/Library/Developer/Xcode/DerivedData/
+
+      - name: Create XCFramework
+        run: |
+          set -o pipefail
+          export MACH_O_TYPE="${{ matrix.MACH_O_TYPE }}"
+          ./Scripts/create-xcframework.sh
+          ./Scripts/sign-xcframework.sh
+
+      - name: Archive XCFramework
+        run: |
+          cd build
+          zip -r -y SDWebImage-${{ matrix.linkage }}.xcframework.zip SDWebImage.xcframework
+          cd ../
+          mv build/SDWebImage-${{ matrix.linkage }}.xcframework.zip SDWebImage-${{ matrix.linkage }}.xcframework.zip
+          rm -rf build
+
+      - uses: softprops/[email protected]
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_REPOSITORY: "${{ github.repository }}"
+        with:
+          files: "SDWebImage-${{ matrix.linkage }}.xcframework.zip"

.github/workflows/CI.yml

@@ -12,11 +12,12 @@ permissions:
   contents: read
 
 jobs:
-  Pods:
+  Lint:
     name: Cocoapods Lint
-    runs-on: macos-11
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+      LC_ALL: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -27,10 +28,10 @@ jobs:
       - name: Install Xcpretty
         run: gem install xcpretty --no-document --quiet
 
-      - name: Pod Update.
+      - name: Pod Update
         run: pod repo update --silent
 
-      - name: Pod Install.
+      - name: Pod Install
         run: pod install
 
       - name: Run SDWebImage podspec lint
@@ -39,22 +40,19 @@ jobs:
           pod lib lint SDWebImage.podspec --allow-warnings --skip-tests
           
   Demo:
-    name: Run Demo
-    runs-on: macos-11
+    name: Cocoapods Demo
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+      LC_ALL: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app
       WORKSPACE_NAME: SDWebImage.xcworkspace
-      OSXSCHEME: SDWebImage OSX Demo
-      iOSSCHEME: SDWebImage iOS Demo
-      TVSCHEME: SDWebImage TV Demo
-      WATCHSCHEME: SDWebImage Watch Demo
-    strategy:
-      matrix:
-        iosDestination: ["name=iPhone 13 Pro"]
-        tvOSDestination: ["name=Apple TV 4K"]
-        watchOSDestination: ["platform=watchOS Simulator,name=Apple Watch Series 7 - 45mm"]
-        macOSDestination: ["platform=macOS"]
-        macCatalystDestination: ["platform=macOS,arch=x86_64,variant=Mac Catalyst"]
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      iosDestination: generic/platform=iOS Simulator
+      macOSDestination: platform=macOS,arch=x86_64
+      macCatalystDestination: platform=macOS,arch=x86_64,variant=Mac Catalyst
+      tvOSDestination: generic/platform=tvOS Simulator
+      watchOSDestination: generic/platform=watchOS Simulator
+      visionOSDestination: generic/platform=visionOS Simulator
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -74,38 +72,63 @@ jobs:
       - name: Run demo for OSX
         run: |
           set -o pipefail
-          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.OSXSCHEME }}" -destination "${{ matrix.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImage OSX Demo" -destination "${{ env.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
           
       - name: Run demo for iOS
         run: |
           set -o pipefail
-          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.iOSSCHEME }}" -destination "${{ matrix.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImage iOS Demo" -destination "${{ env.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
           
       - name: Run demo for TV
         run: |
           set -o pipefail
-          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.TVSCHEME }}" -destination "${{ matrix.tvOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImage TV Demo" -destination "${{ env.tvOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
           
       - name: Run demo for Watch
         run: |
           set -o pipefail
-          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "${{ env.WATCHSCHEME }}" -destination "${{ matrix.watchOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
-          
+          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImage Watch Demo" -destination "${{ env.watchOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+
+      - name: Run demo for Vision
+        run: |
+          set -o pipefail
+          xcodebuild build -workspace "${{ env.WORKSPACE_NAME }}" -scheme "SDWebImage Vision Demo" -destination "${{ env.visionOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+
   Test:
     name: Unit Test
-    runs-on: macos-11
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+      LC_ALL: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app
       WORKSPACE_NAME: SDWebImage.xcworkspace
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    # use matrix to generate jobs for each platform
     strategy:
+      fail-fast: false
       matrix:
-        iosDestination: ["platform=iOS Simulator,name=iPhone 13 Pro"]
-        macOSDestination: ["platform=macOS,arch=x86_64"]
-        tvOSDestination: ["platform=tvOS Simulator,name=Apple TV 4K"]
+        platform: [iOS, macOS, tvOS, visionOS]
+        include:
+          - platform: iOS
+            destination: platform=iOS Simulator,name=iPhone 16 Pro Max
+            scheme: iOS
+            flag: ios
+          - platform: macOS
+            destination: platform=macOS,arch=x86_64
+            scheme: Mac
+            flag: macos
+          - platform: tvOS
+            destination: platform=tvOS Simulator,name=Apple TV 4K (3rd generation)
+            scheme: TV
+            flag: tvos
+          - platform: visionOS
+            destination: platform=visionOS Simulator,name=Apple Vision Pro
+            scheme: Vision
+            flag: visionos
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Install Cocoapods
         run: gem install cocoapods --no-document --quiet
@@ -118,62 +141,38 @@ jobs:
 
       - name: Pod Install
         run: pod install
-        
+
       - name: Clean DerivedData
         run: |
           rm -rf ~/Library/Developer/Xcode/DerivedData/
           mkdir DerivedData
         
-      - name: Test - ${{ matrix.iosDestination }}
+      - name: Run test
         run: |
           set -o pipefail
-          xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "Tests iOS" -destination "${{ matrix.iosDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO
-          mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS
-          
-      - name: Test - ${{ matrix.macOSDestination }}
-        run: |
-          set -o pipefail
-          xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "Tests Mac" -destination "${{ matrix.macOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO
-          mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/macOS
-    
-      - name: Test - ${{ matrix.tvOSDestination }}
-        run: |
-          set -o pipefail
-          xcodebuild test -workspace "${{ env.WORKSPACE_NAME }}" -scheme "Tests TV" -destination "${{ matrix.tvOSDestination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO
-          mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/tvOS
+          xcodebuild build-for-testing -workspace "${{ env.WORKSPACE_NAME }}" -scheme "Tests ${{ matrix.scheme }}" -destination "${{ matrix.destination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO | xcpretty -c
+          xcodebuild test-without-building -workspace "${{ env.WORKSPACE_NAME }}" -scheme "Tests ${{ matrix.scheme }}" -destination "${{ matrix.destination }}" -configuration Debug CODE_SIGNING_ALLOWED=NO
+          mv ~/Library/Developer/Xcode/DerivedData/ "./DerivedData/${{ matrix.platform }}"
           
       - name: Code Coverage
         run: |
           set -o pipefail
           export PATH="/usr/local/opt/curl/bin:$PATH"
           curl --version
-          bash <(curl -s https://codecov.io/bash) -v -D './DerivedData/macOS' -J '^SDWebImage$' -c -X gcov -F macos
-          bash <(curl -s https://codecov.io/bash) -v -D './DerivedData/iOS' -J '^SDWebImage$' -c -X gcov -F ios
-          bash <(curl -s https://codecov.io/bash) -v -D './DerivedData/tvOS' -J '^SDWebImage$' -c -X gcov -F tvos
+          bash <(curl -s https://codecov.io/bash) -v -D "./DerivedData/${{ matrix.platform }}" -J '^SDWebImage$' -c -X gcov -F "${{ matrix.flag }}"
           
   Build:
     name: Build Library
-    runs-on: macos-11
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
+      LC_ALL: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app
       PROJECT_NAME: SDWebImage.xcodeproj
       SCHEME_NAME: SDWebImage
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install Cocoapods
-        run: gem install cocoapods --no-document --quiet
-        
-      - name: Install Xcpretty
-        run: gem install xcpretty --no-document --quiet
-        
-      - name: Pod Update
-        run: pod repo update --silent
-        
-      - name: Pod Install
-        run: pod install
-
       - name: Build the SwiftPM
         run: |
           set -o pipefail
@@ -183,14 +182,15 @@ jobs:
       - name: Build as static library
         run: |
           set -o pipefail
-          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "SDWebImage static" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "SDWebImage static" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
           rm -rf ~/Library/Developer/Xcode/DerivedData/
       - name: Build as dynamic frameworks
         run: |
           set -o pipefail
-          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk macosx -configuration Release | xcpretty -c
-          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Release | xcpretty -c
-          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk appletvsimulator -configuration Release | xcpretty -c
-          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk watchsimulator -configuration Release | xcpretty -c
-          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -destination "platform=macOS,arch=x86_64,variant=Mac Catalyst" -configuration Release | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk macosx -configuration Debug | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk iphonesimulator PLATFORM_NAME=iphonesimulator -configuration Debug | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk appletvsimulator -configuration Debug | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk watchsimulator -configuration Debug | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -destination "platform=macOS,arch=x86_64,variant=Mac Catalyst" -configuration Debug | xcpretty -c
+          xcodebuild build -project "${{ env.PROJECT_NAME }}" -scheme "${{ env.SCHEME_NAME }}" -sdk xrsimulator -configuration Debug | xcpretty -c
           rm -rf ~/Library/Developer/Xcode/DerivedData/