Add Capacitor support and update dependencies, bump to v2

Author: coturiv

.eslintrc.json .eslintrc.eslintrc.json renamed to .eslintrc

@@ -1,4 +1,4 @@
-{
+{ 
   "plugins": ["jest", "@typescript-eslint"],
   "extends": ["plugin:github/recommended"],
   "parser": "@typescript-eslint/parser",

.github/workflows/ci.yml

@@ -1,31 +1,94 @@
 name: "CI"
-on: # rebuild any PRs and main branch changes
+on:
   pull_request:
   push:
     branches:
       - master
 
 jobs:
-  build: # make sure build/ci work properly
-    runs-on: ubuntu-latest
+  build:
+    name: Build and test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        node: [20]
     steps:
-    - uses: actions/checkout@v5
-    - run: |
-        npm ci
-        npm run all
-  test: # make sure the action works on a clean machine without building
-    runs-on: ubuntu-latest
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v6
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm ci
+      - run: npm run all
+
+  # merged into integration jobs below
+
+  test-cordova:
+    name: Test (Cordova) on Ubuntu/macOS; iOS on macOS
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 20
+      - name: Setup environment
+        uses: ./
+        with:
+          legacy: true
+          install-pods: ${{ matrix.os == 'macos-latest' }}
+      - name: Verify CLI
+        run: |
+          cordova -v
+          ionic info || true
+      - name: Build Android sample
+        run: |
+          ionic start testapp blank --cordova --type angular --no-link --no-git --no-interactive --confirm
+          cd testapp
+          ionic cordova platform add android@latest
+          ionic cordova build android
+      - name: Build iOS sample (macOS only)
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          cd testapp
+          ionic cordova platform add ios@latest
+          ionic cordova build ios --no-interactive -- --buildFlag="-sdk iphonesimulator"
+
+  test-capacitor:
+    name: Test (Capacitor) on Ubuntu/macOS; iOS on macOS
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-java@v5
-      with:
-        distribution: 'adopt' # See 'Supported distributions' for available options
-        java-version: 8
-    - name: Use coturiv/setup-ionic
-      uses: ./
-    - name: Run cordova project tests
-      run: |
-        ionic start testapp blank --cordova --type angular --no-link --no-git --no-interactive --confirm
-        cd testapp
-        ionic cordova platform add android@latest
-        ionic cordova build android
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 20
+      - name: Setup environment
+        uses: ./
+        with:
+          legacy: false
+          install-pods: ${{ matrix.os == 'macos-latest' }}
+      - name: Verify CLI
+        run: |
+          cap --version
+          ionic info || true
+      - name: Build Android sample
+        run: |
+          ionic start testapp blank --type angular --no-link --no-git --no-interactive --confirm
+          cd testapp
+          ionic cap add android
+          ionic cap build android
+      - name: Build iOS sample (macOS only)
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          cd testapp
+          ionic cap add ios
+          npx cap sync ios
+          xcodebuild -workspace ios/App/App.xcworkspace -scheme App -sdk iphonesimulator -configuration Debug build

.prettierrc.json .prettierrc.prettierrc.json renamed to .prettierrc

@@ -8,4 +8,4 @@
     "bracketSpacing": false,
     "arrowParens": "avoid",
     "parser": "typescript"
-  }
+  }

README.md

@@ -2,33 +2,47 @@
 
 [![](https://github.com/coturiv/setup-ionic/workflows/CI/badge.svg)](https://github.com/coturiv/setup-ionic/actions)
 
-Set up your GitHub Actions workflow with Cordova/Ionic environment. Only supports macos & ubuntu at this time.
+Set up your GitHub Actions workflow with Capacitor or Cordova environment. Supports macOS, Ubuntu, and Windows.
 
-## example usage:
+## example usage
 
 ```
-- name: Use coturiv/setup-ionic
-  uses: coturiv/setup-ionic@v1
+# Capacitor (default)
+- name: Setup environment
+  uses: coturiv/setup-ionic@v2
   with:
-    java-version: 8
-- name: Use coturiv/setup-ionic
-  uses: coturiv/setup-ionic@v1
+    legacy: false
+    capacitor-version: latest
+    java-version: 17
+
+- name: Build Android
+  run: |
+    npx cap sync android
+    cd android
+    ./gradlew assembleDebug
+
+- name: Build iOS (macOS only)
+  run: |
+    npx cap sync ios
+    xcodebuild -workspace ios/App/App.xcworkspace -scheme App -sdk iphonesimulator -configuration Debug build
+
+# Cordova (legacy)
+- name: Setup environment
+  uses: coturiv/setup-ionic@v2
   with:
-    cordova-version: 8
+    legacy: true
+    cordova-version: 10
+    java-version: 17
 
-- name: Build
+- name: Build Android
   run: |
     ionic cordova build android --prod
-
 ```
 
-### important*
-
-_From Ubuntu 20.04 runners, the default version of Java is 11, so you need to specify it to 8(1.8), due to the requirement of cordova, but will be removed in future releases. See [here](), and [here](https://cordova.apache.org/docs/en/latest/guide/platforms/android/index.html#java-development-kit-jdk)_
+### caching
 
-```
-- name: Set up JDK 1.8
-  uses: actions/setup-java@v1
-  with:
-    java-version: 1.8
-```
+- Automatically restores/saves caches for:
+  - `node_modules` keyed by lockfile
+  - Gradle caches and wrapper
+  - CocoaPods caches (macOS) and `ios/Pods`
+  - Android SDK directory keyed by installed platforms/build-tools

action.yml

@@ -1,5 +1,5 @@
 name: 'Setup Ionic'
-description: 'Set up your GitHub Actions workflow with Cordova/Ionic environment. Only supports macos & ubuntu at this time.'
+description: 'Set up your GitHub Actions workflow with Capacitor or Cordova environment.'
 author: 'coturiv'
 branding:
   color: purple
@@ -8,9 +8,17 @@ branding:
 inputs:
   cordova-version:
     description: Version range or exact version of Cordova to use
-    default: '10'
   ionic-version:
     description: Version range or exact version of Ionic to use
+  capacitor-version:
+    description: Version range or exact version of Capacitor CLI to use
+    default: 'latest'
+  legacy:
+    description: Use Cordova (true) or Capacitor (false)
+    default: 'false'
+  java-version:
+    description: JDK major version to install on Linux/macOS (e.g. 17, 21)
+    default: '17'
   install-java:
     description: Whether to install Java
     default: true
@@ -19,5 +27,5 @@ inputs:
     default: true
 
 runs:
-  using: 'node12'
+  using: 'node20'
   main: 'dist/index.js'