diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml deleted file mode 100644 index 53bc3c4b..00000000 --- a/.github/workflows/CD.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: CD - -on: - pull_request_target: - branches: [main] - types: [closed] - -jobs: - release_version: - if: github.event.pull_request.milestone == null && github.event.pull_request.merged == true - runs-on: macOS-latest - steps: - - uses: actions/checkout@v2 - - - name: Publish release - id: publish_release - uses: release-drafter/release-drafter@v5 - with: - publish: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Update podspec - run: fastlane bump_version next_version:${{ steps.publish_release.outputs.tag_name }} - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 - with: - branch: 'main' - commit_message: 'Bump version ${{ steps.publish_release.outputs.tag_name }}' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Deploy to Cocoapods - continue-on-error: true - env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} - run: | - set -eo pipefail - pod lib lint --allow-warnings - pod trunk push --allow-warnings - - - name: Tweet the release - uses: ethomson/send-tweet-action@v1 - with: - consumer-key: ${{ secrets.TWITTER_CONSUMER_API_KEY }} - consumer-secret: ${{ secrets.TWITTER_CONSUMER_API_SECRET }} - access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }} - access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} - status: | - 🎉 New release ${{ steps.publish_release.outputs.tag_name }} is out 🚀 - - Check out all the changes here: - ${{ steps.publish_release.outputs.html_url }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fea8df8c..4531d628 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,21 +1,173 @@ -name: Release -on: [workflow_dispatch] +name: CD + +on: + workflow_dispatch: + pull_request_target: + branches: [main] + types: [closed] jobs: + build: + name: Build XCFramework + runs-on: macos-latest + strategy: + matrix: + build-config: + - { + scheme: "SkeletonView iOS", + destination: "generic/platform=iOS", + sdk: "iphoneos", + mach_o_type: "mh_dylib", + archive_path: "build/Release-iphoneos/Dynamic", + } + - { + scheme: "SkeletonView iOS", + destination: "generic/platform=iOS Simulator", + sdk: "iphonesimulator", + mach_o_type: "mh_dylib", + archive_path: "build/Release-iphonesimulator/Dynamic", + } + - { + scheme: "SkeletonView tvOS", + destination: "generic/platform=tvOS", + sdk: "appletvos", + mach_o_type: "mh_dylib", + archive_path: "build/Release-appletvos/Dynamic", + } + - { + scheme: "SkeletonView tvOS", + destination: "generic/platform=tvOS Simulator", + sdk: "appletvsimulator", + mach_o_type: "mh_dylib", + archive_path: "build/Release-appletvsimulator/Dynamic", + } + - { + scheme: "SkeletonView iOS", + destination: "generic/platform=iOS", + sdk: "iphoneos", + mach_o_type: "staticlib", + archive_path: "build/Release-iphoneos/Static", + } + - { + scheme: "SkeletonView iOS", + destination: "generic/platform=iOS Simulator", + sdk: "iphonesimulator", + mach_o_type: "staticlib", + archive_path: "build/Release-iphonesimulator/Static", + } + - { + scheme: "SkeletonView tvOS", + destination: "generic/platform=tvOS", + sdk: "appletvos", + mach_o_type: "staticlib", + archive_path: "build/Release-appletvos/Static", + } + - { + scheme: "SkeletonView tvOS", + destination: "generic/platform=tvOS Simulator", + sdk: "appletvsimulator", + mach_o_type: "staticlib", + archive_path: "build/Release-appletvsimulator/Static", + } + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Build framework + run: | + xcodebuild archive \ + -scheme "${{ matrix.build-config.scheme }}" \ + -destination "${{ matrix.build-config.destination }}" \ + -configuration "Release" \ + -sdk "${{ matrix.build-config.sdk }}" \ + -archivePath "${{ matrix.build-config.archive_path }}/SkeletonView.xcarchive" \ + SKIP_INSTALL=NO BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ + MACH_O_TYPE=${{ matrix.build-config.mach_o_type }} + + - name: Upload archive as artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.build-config.sdk }}-build-${{ matrix.build-config.mach_o_type }} + path: ${{ matrix.build-config.archive_path }} + + create-xcframework: + name: Create XCFramework + needs: build + runs-on: macos-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + path: build/ + + - name: Verify downloaded artifacts + run: ls -R build/ + + - name: Create Static XCFramework + run: | + xcodebuild -create-xcframework \ + -framework build/iphoneos-build-staticlib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -framework build/iphonesimulator-build-staticlib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -framework build/appletvos-build-staticlib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -framework build/appletvsimulator-build-staticlib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -output build/XCFramework/SkeletonViewStatic.xcframework + + - name: Create Dynamic XCFramework + run: | + xcodebuild -create-xcframework \ + -framework build/iphoneos-build-mh_dylib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -framework build/iphonesimulator-build-mh_dylib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -framework build/appletvos-build-mh_dylib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -framework build/appletvsimulator-build-mh_dylib/SkeletonView.xcarchive/Products/Library/Frameworks/SkeletonView.framework \ + -output build/XCFramework/SkeletonViewDynamic.xcframework + + - name: Compress XCFrameworks + run: | + cd build/XCFramework + zip -r SkeletonViewStatic.xcframework.zip SkeletonViewStatic.xcframework + zip -r SkeletonViewDynamic.xcframework.zip SkeletonViewDynamic.xcframework + + - name: Upload XCFrameworks as Artifacts + uses: actions/upload-artifact@v3 + with: + name: XCFrameworks-Zip + path: build/XCFramework/*.xcframework.zip + release_version: - runs-on: macOS-latest + name: Release Version + needs: create-xcframework + runs-on: macos-latest + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + + - name: Download XCFrameworks ZIP + uses: actions/download-artifact@v3 + with: + name: XCFrameworks-Zip - name: Publish release id: publish_release - uses: release-drafter/release-drafter@v5 + uses: release-drafter/release-drafter@v6 with: publish: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Update podspec + - name: Publish XCFrameworks + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ steps.publish_release.outputs.tag_name }} + files: | + SkeletonViewDynamic.xcframework.zip + SkeletonViewStatic.xcframework.zip + + - name: Update version in podspec run: fastlane bump_version next_version:${{ steps.publish_release.outputs.tag_name }} - name: Commit changes @@ -26,7 +178,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Deploy to Cocoapods + - name: Deploy to CocoaPods env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} run: | diff --git a/Package.swift b/Package.swift index 83079270..cd2e3dc9 100644 --- a/Package.swift +++ b/Package.swift @@ -1,12 +1,12 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.10 import PackageDescription let package = Package( name: "SkeletonView", platforms: [ - .iOS(.v9), - .tvOS(.v9) + .iOS(.v12), + .tvOS(.v12) ], products: [ .library( diff --git a/SkeletonView.podspec b/SkeletonView.podspec index e426ec3b..6a70fb64 100644 --- a/SkeletonView.podspec +++ b/SkeletonView.podspec @@ -12,8 +12,18 @@ Pod::Spec.new do |s| s.social_media_url = "https://x.com/JuanpeCatalan" s.ios.deployment_target = "12.0" s.tvos.deployment_target = "12.0" - s.swift_version = "5.10" + s.swift_version = "5.0" s.source = { :git => "https://github.com/Juanpe/SkeletonView.git", :tag => s.version.to_s } s.source_files = "SkeletonViewCore/Sources/**/*.{swift,h}" - s.resource_bundles = {"SkeletonView" => ["SkeletonViewCore/Sources/Supporting Files/PrivacyInfo.xcprivacy"]} + s.vendored_frameworks = "SkeletonView.xcframework" + + # Subspec para o framework estático + s.subspec "Static" do |sp| + sp.vendored_frameworks = "StaticXCFramework.xcframework" + end + + # Subspec para o framework dinâmico + s.subspec "Dynamic" do |sp| + sp.vendored_frameworks = "DynamicXCFramework.xcframework" + end end