diff --git a/.github/workflows/primary.yml b/.github/workflows/primary.yml index 9adf1f0..ce03141 100644 --- a/.github/workflows/primary.yml +++ b/.github/workflows/primary.yml @@ -46,39 +46,3 @@ jobs: - uses: actions/checkout@v4 - name: Lint Podspec run: pod lib lint --allow-warnings - - xcframework: - name: XCFramework - runs-on: macOS-14 - steps: - - uses: actions/checkout@v4 - - - name: Build XCFramework - run: ci/build_xcframework.sh - - - uses: actions/upload-artifact@v4 - with: - name: PocketSVG.xcframework - path: derived_data/xcframework/PocketSVG.xcframework - retention-days: 5 - - create-release: - name: Make release - runs-on: macOS-13 - if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') # only if tag is pushed - needs: [primary, cocoapods, spm, xcframework] - steps: - - uses: actions/checkout@v4 - - - uses: actions/download-artifact@v4 - with: - name: PocketSVG.xcframework - path: PocketSVG.xcframework - - - name: Make release - run: | - echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token - TAG_NAME=${GITHUB_REF#refs/*/} - zip -r9 "PocketSVG.xcframework.zip" "PocketSVG.xcframework" - gh release create $TAG_NAME --notes "" - gh release upload $TAG_NAME PocketSVG.xcframework.zip diff --git a/Package.swift b/Package.swift index 2900e3c..24e8cf3 100644 --- a/Package.swift +++ b/Package.swift @@ -5,17 +5,17 @@ import PackageDescription let package = Package( name: "PocketSVG", platforms: [ - .macOS(.v10_10), - .iOS(.v9), - .tvOS(.v10), - .watchOS(.v3), - .visionOS(.v1) + .macOS(.v10_13), + .iOS(.v12), + .tvOS(.v12), + .watchOS(.v4), + .visionOS(.v1), ], products: [ .library( name: "PocketSVG", - type: .dynamic, - targets: ["PocketSVG"]) + targets: ["PocketSVG"] + ), ], targets: [ .target( @@ -35,5 +35,6 @@ let package = Package( ] ), ], + swiftLanguageVersions: [.v5], cxxLanguageStandard: .cxx14 ) diff --git a/ci/build_xcframework.sh b/ci/build_xcframework.sh deleted file mode 100755 index fc818d3..0000000 --- a/ci/build_xcframework.sh +++ /dev/null @@ -1,87 +0,0 @@ -# -# This file is part of the PocketSVG package. -# -# Copyright (c) Ponderwell, Ariel Elkin, Fjölnir Ásgeirsson, and Contributors -# For the full copyright and license information, please view the LICENSE -# file that was distributed with this source code. -# -#!/usr/bin/env bash -set -xeo pipefail - -IOS_SIMULATOR_XCARCHIVE_PATH="derived_data/archives/PocketSVG-iOS-Simulator.xcarchive" -IOS_DEVICE_XCARCHIVE_PATH="derived_data/archives/PocketSVG-iOS-Device.xcarchive" -MACOS_XCARCHIVE_PATH="derived_data/archives/PocketSVG-macOS.xcarchive" -TVOS_XCARCHIVE_PATH="derived_data/archives/PocketSVG-tvOS.xcarchive" -CATALYST_XCARCHIVE_PATH="derived_data/archives/PocketSVG-Catalyst.xcarchive" -VISIONOS_XCARCHIVE_PATH="derived_data/archives/PocketSVG-visionOS.xcarchive" -XCFRAMEWORK_PATH="derived_data/xcframework/PocketSVG.xcframework" - -xcodebuild archive \ - -scheme PocketSVG \ - -destination 'generic/platform=iOS' \ - -derivedDataPath derived_data \ - -archivePath $IOS_DEVICE_XCARCHIVE_PATH \ - SKIP_INSTALL=NO \ - BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ - | xcbeautify - -xcodebuild archive \ - -scheme PocketSVG \ - -destination 'generic/platform=iOS Simulator' \ - -derivedDataPath derived_data \ - -archivePath $IOS_SIMULATOR_XCARCHIVE_PATH \ - SKIP_INSTALL=NO \ - BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ - | xcbeautify - -xcodebuild archive \ - -scheme PocketSVG \ - -destination 'generic/platform=macOS' \ - -derivedDataPath derived_data \ - -archivePath $MACOS_XCARCHIVE_PATH \ - SKIP_INSTALL=NO \ - BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ - | xcbeautify - -xcodebuild archive \ - -scheme PocketSVG \ - -destination 'generic/platform=appletvos' \ - -derivedDataPath derived_data \ - -archivePath $TVOS_XCARCHIVE_PATH \ - SKIP_INSTALL=NO \ - BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ - | xcbeautify - -xcodebuild archive \ - -scheme PocketSVG \ - -destination 'generic/platform=macOS,variant=Mac Catalyst' \ - -derivedDataPath derived_data \ - -archivePath $CATALYST_XCARCHIVE_PATH \ - SKIP_INSTALL=NO \ - BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ - | xcbeautify - -xcodebuild archive \ - -scheme PocketSVG \ - -destination 'generic/platform=visionOS' \ - -derivedDataPath derived_data \ - -archivePath $VISIONOS_XCARCHIVE_PATH \ - SKIP_INSTALL=NO \ - BUILD_LIBRARY_FOR_DISTRIBUTION=YES \ - | xcbeautify - -IOS_SIMULATOR_FRAMEWORK_PATH=$(find $IOS_SIMULATOR_XCARCHIVE_PATH -name "*.framework") -IOS_DEVICE_FRAMEWORK_PATH=$(find $IOS_DEVICE_XCARCHIVE_PATH -name "*.framework") -MACOS_FRAMEWORK_PATH=$(find $MACOS_XCARCHIVE_PATH -name "*.framework") -TVOS_FRAMEWORK_PATH=$(find $TVOS_XCARCHIVE_PATH -name "*.framework") -CATALYST_FRAMEWORK_PATH=$(find $CATALYST_XCARCHIVE_PATH -name "*.framework") -VISIONOS_FRAMEWORK_PATH=$(find $VISIONOS_XCARCHIVE_PATH -name "*.framework") - -xcodebuild -create-xcframework \ - -framework $IOS_SIMULATOR_FRAMEWORK_PATH \ - -framework $IOS_DEVICE_FRAMEWORK_PATH \ - -framework $MACOS_FRAMEWORK_PATH \ - -framework $TVOS_FRAMEWORK_PATH \ - -framework $CATALYST_FRAMEWORK_PATH \ - -framework $VISIONOS_FRAMEWORK_PATH \ - -output $XCFRAMEWORK_PATH