diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 990d1d300..fb169d339 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-12] + os: [ubuntu-latest, macos-13] timeout-minutes: 30 outputs: plugins: ${{ steps.packages.outputs.paths }} @@ -51,7 +51,7 @@ jobs: files: ${{ steps.catjson.outputs.FILES_JSON }} lint: - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 needs: - setup @@ -74,7 +74,7 @@ jobs: - run: npm run lint verify-ios: - runs-on: macos-12 + runs-on: macos-13 if: needs.setup.outputs.plugins != '[]' timeout-minutes: 30 needs: @@ -83,7 +83,7 @@ jobs: strategy: matrix: xcode: - - /Applications/Xcode_14.2.app + - /Applications/Xcode_15.0.app plugin: ${{ fromJson(needs.setup.outputs.plugins) }} steps: - run: sudo xcode-select --switch ${{ matrix.xcode }} diff --git a/.github/workflows/publish-ios.yml b/.github/workflows/publish-ios.yml index 844929b2d..ac633e06c 100644 --- a/.github/workflows/publish-ios.yml +++ b/.github/workflows/publish-ios.yml @@ -8,14 +8,14 @@ on: required: true jobs: publish-ios: - runs-on: macos-12 + runs-on: macos-13 if: github.event.inputs.plugins != '[]' timeout-minutes: 30 strategy: matrix: plugin: ${{ fromJson(github.event.inputs.plugins) }} steps: - - run: sudo xcode-select --switch /Applications/Xcode_14.2.app + - run: sudo xcode-select --switch /Applications/Xcode_15.0.app - uses: actions/setup-node@v3 with: node-version: 16 diff --git a/.github/workflows/publish-npm-alpha.yml b/.github/workflows/publish-npm-alpha.yml index a3ac53a30..d23ece87b 100644 --- a/.github/workflows/publish-npm-alpha.yml +++ b/.github/workflows/publish-npm-alpha.yml @@ -8,7 +8,7 @@ permissions: jobs: deploy-npm-alpha: - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-npm-beta.yml b/.github/workflows/publish-npm-beta.yml index a2bc5cfeb..52c0ea7d8 100644 --- a/.github/workflows/publish-npm-beta.yml +++ b/.github/workflows/publish-npm-beta.yml @@ -8,7 +8,7 @@ permissions: jobs: deploy-npm-beta: - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-npm-dev.yml b/.github/workflows/publish-npm-dev.yml index 4bd122812..59594db91 100644 --- a/.github/workflows/publish-npm-dev.yml +++ b/.github/workflows/publish-npm-dev.yml @@ -8,7 +8,7 @@ permissions: jobs: deploy-npm-dev: - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-npm-latest-from-pre.yml b/.github/workflows/publish-npm-latest-from-pre.yml index 57844ea3d..1accb8956 100644 --- a/.github/workflows/publish-npm-latest-from-pre.yml +++ b/.github/workflows/publish-npm-latest-from-pre.yml @@ -16,7 +16,7 @@ permissions: jobs: deploy-npm-latest-from-pre: if: github.ref == 'refs/heads/main' - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-npm-latest.yml b/.github/workflows/publish-npm-latest.yml index 6eaf7bd45..a0f462a7e 100644 --- a/.github/workflows/publish-npm-latest.yml +++ b/.github/workflows/publish-npm-latest.yml @@ -16,7 +16,7 @@ permissions: jobs: deploy-npm-latest: if: github.ref == 'refs/heads/main' - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-npm-nightly.yml b/.github/workflows/publish-npm-nightly.yml index b534d771f..e1e5c46d8 100644 --- a/.github/workflows/publish-npm-nightly.yml +++ b/.github/workflows/publish-npm-nightly.yml @@ -11,7 +11,7 @@ permissions: jobs: deploy-npm-nightly: if: github.ref == 'refs/heads/main' - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish-npm-rc.yml b/.github/workflows/publish-npm-rc.yml index 600e3befd..97e7fb4f7 100644 --- a/.github/workflows/publish-npm-rc.yml +++ b/.github/workflows/publish-npm-rc.yml @@ -8,7 +8,7 @@ permissions: jobs: deploy-npm-rc: - runs-on: macos-12 + runs-on: macos-13 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1fdf57a0..bebcde00e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ See [`CONTRIBUTING.md`](https://github.com/ionic-team/capacitor/blob/HEAD/CONTRI brew install swiftlint ``` -Sometimes, it may be necessary to work on Capacitor in parellel with the plugin(s). In this case, a few extra steps are necessary: +Sometimes, it may be necessary to work on Capacitor in parallel with the plugin(s). In this case, a few extra steps are necessary: 4. Follow the Capacitor repo's [local setup instructions](https://github.com/ionic-team/capacitor/blob/HEAD/CONTRIBUTING.md#local-setup). 5. Toggle each plugin to use your local copy of Capacitor. @@ -47,13 +47,13 @@ To aid in managing these plugins, this repo has a variety of scripts (located in #### `npm run set-capacitor-version ""` -This script is for setting the version (or version range) of Capacitor packages in each plugin's `package.json`. It will also run `lerna bootstrap` for you. +This script is for setting the version (or version range) of Capacitor packages in each plugin's `package.json`. #### `npm run toggle-local` > :memo: Requires [Capacitor](https://github.com/ionic-team/capacitor/) to be cloned in a sibling directory. -This script is for switching between Capacitor packages from npm and Capacitor packages installed locally. It will also run `lerna bootstrap` for you. +This script is for switching between Capacitor packages from npm and Capacitor packages installed locally. > If you get npm errors, you can try installing from scratch: > diff --git a/package.json b/package.json index 3c1f295f8..6b8df5511 100644 --- a/package.json +++ b/package.json @@ -23,17 +23,18 @@ "ci:publish:dev": "lerna publish prerelease --conventional-commits --conventional-prerelease --preid dev-$(date +\"%Y%m%dT%H%M%S\") --force-publish --no-changelog --no-git-tag-version --dist-tag dev --no-push --yes" }, "devDependencies": { - "@types/node": "~18.11.19", "@actions/core": "^1.9.1", + "@actions/http-client": "2.1.1", "@ionic/prettier-config": "^1.0.1", + "@types/node": "~18.11.19", "@types/prompts": "^2.0.8", "cross-spawn": "^7.0.3", "esm": "^3.2.25", + "glob": "^10.3.3", "lerna": "^7.1.3", "nx": "^16.3.1", "prettier": "~2.3.0", "prompts": "^2.3.2", - "glob": "^10.3.3", "typescript": "~4.1.5" }, "prettier": "@ionic/prettier-config",