diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 7d477e8..8234c04 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -13,7 +13,9 @@ jobs: - run: sudo xcode-select --switch /Applications/Xcode_13.0.app - uses: actions/checkout@v2 - name: Install build dependencies - run: gem install cocoapods xcpretty + run: | + gem install cocoapods xcpretty + brew install ghr - name: Assign version to RELEASE_VERSION environment variable run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/*/}" >> $GITHUB_ENV - name: Build Capacitor and Cordova @@ -21,9 +23,5 @@ jobs: - name: Push manifest update uses: EndBug/add-and-commit@v9 - name: Create Draft Release - uses: ncipollo/release-action@v1 - with: - artifacts: "./capacitor-checkout/ios/Capacitor/Capacitor.xcframework.zip,./capacitor-checkout/ios/Capacitor/Cordova.xcframework.zip" - draft: true - tag: ${{ env.RELEASE_VERSION }} + run: ghr -token ${{ secrets.GITHUB_TOKEN }} -name ${{ env.RELEASE_VERSION }} -draft -replace ${{ env.RELEASE_VERSION }} frameworks diff --git a/.gitignore b/.gitignore index 6347f3b..8dd5b10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ capacitor-checkout *.zip .swiftpm +frameworks diff --git a/Package.swift b/Package.swift index d377613..ada0539 100644 --- a/Package.swift +++ b/Package.swift @@ -12,19 +12,19 @@ let package = Package( .library( name: "Cordova", targets: ["Cordova"] - ), + ) ], dependencies: [], targets: [ .binaryTarget( name: "Capacitor", - url: "https://github.com/ionic-team/capacitor-swift-pm/releases/download/3.6.0/Capacitor.xcframework.zip", - checksum: "311a29907502e995fad871428f4889f8c156c43566dc6d616f02d94cdd944197" + url: "https://github.com/ionic-team/capacitor-swift-pm/releases/download/3.7.0/Capacitor.xcframework.zip", + checksum: "233a76f8b5c2a3888d78b055b9d5d2f5a781e213442df55b0bc6db6de6419b34" ), .binaryTarget( name: "Cordova", - url: "https://github.com/ionic-team/capacitor-swift-pm/releases/download/3.6.0/Cordova.xcframework.zip", - checksum: "9f562768d83888219ed90840f0d9c0f4e47105d3c45382257339282e8a4ebf9c" + url: "https://github.com/ionic-team/capacitor-swift-pm/releases/download/3.7.0/Cordova.xcframework.zip", + checksum: "5489089d27d40ec0e9dc9e2522aafabcba44475200c98459508c6ccfe2474841" ) ] ) diff --git a/build-cap b/build-cap index db37b7b..7763c1d 100755 --- a/build-cap +++ b/build-cap @@ -67,8 +67,12 @@ let package = Package( products: [ .library( name: "Capacitor", - targets: ["Capacitor", "Cordova"] + targets: ["Capacitor"] ), + .library( + name: "Cordova", + targets: ["Cordova"] + ) ], dependencies: [], targets: [ @@ -99,6 +103,8 @@ cap_cordova_url="https://github.com/ionic-team/capacitor-swift-pm/releases/downl cap_cordova_sha=$(shasum -a 256 Cordova.xcframework.zip | sed 's/ /\n/g' | head -n1 | xargs echo -n) cd ../../../ +mkdir frameworks +mv capacitor-checkout/ios/Capacitor/{Capacitor,Cordova}.xcframework.zip frameworks write_package_file $cap_url $cap_sha $cap_cordova_url $cap_cordova_sha