Merge pull request #31 from ionic-team/feat/RMET-4099/camera-unification

feat(android,ios): merge to main

Author: alexgerardojacinto

.eslintignore

@@ -1,2 +1,4 @@
 build
+.build
 dist
+example-app

.github/actions/setup-tools/action.yml

@@ -11,7 +11,11 @@ runs:
     # Ensure npm 11.5.1 or later is installed for Trusted publishing
     - name: Update npm
       shell: bash
-      run: npm install -g npm@latest
+      run: npm install -g npm@~11.10.0 
     - name: Install dependencies
       shell: bash
       run: npm i
+    - name: Set Xcode 26.0  # minimum support Xcode version by Capacitor 8
+      if: runner.os == 'macOS'
+      shell: bash
+      run: sudo xcode-select --switch /Applications/Xcode_26.0.app

.github/workflows/continuous_integration.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: 'macos-15'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: 'Setup Tools'
         uses: ./.github/actions/setup-tools
       - name: 'Verify Android'
@@ -38,8 +38,36 @@ jobs:
     runs-on: 'macos-15'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: 'Setup Tools'
         uses: ./.github/actions/setup-tools
       - name: 'Verify iOS'
         run: npm run verify:ios
+
+  build-example-app-android:
+    needs: ['verify-plugin-ios', 'verify-plugin-android']
+    runs-on: 'macos-15'
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v6
+      - name: 'Setup Tools'
+        uses: ./.github/actions/setup-tools
+      - name: 'Prepare example app'
+        uses: ./.github/actions/prepare-example-app
+      - name: 'Build Android example app'
+        working-directory: ./example-app/android
+        run: ./gradlew clean assembleDebug
+    
+  build-example-app-ios:
+    needs: ['verify-plugin-ios', 'verify-plugin-android']
+    runs-on: 'macos-15'
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v6
+      - name: 'Setup Tools'
+        uses: ./.github/actions/setup-tools
+      - name: 'Prepare example app'
+        uses: ./.github/actions/prepare-example-app
+      - name: 'Build iOS example app'
+        working-directory: ./example-app/ios/App
+        run: xcodebuild clean build -project App.xcodeproj -scheme App CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

.github/workflows/reusable_build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: "ubuntu-24.04"
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.THE_GH_RELEASE_TOKEN || github.token }}

.github/workflows/reusable_lint.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: 'macos-15'
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.THE_GH_RELEASE_TOKEN || github.token }}
 

.github/workflows/reusable_setup.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ secrets.THE_GH_RELEASE_TOKEN || github.token }}
 

.prettierignore

@@ -0,0 +1,4 @@
+build
+.build
+dist
+example-app

CONTRIBUTING.md

@@ -0,0 +1,67 @@
+# Contributing
+
+This guide provides instructions for contributing to this Capacitor plugin.
+
+## Native code
+
+This repository contains minimal code for native Android and iOS. The implementation for native mobile exists in separate repositories:
+
+- [Contributing for Android](https://github.com/ionic-team/ion-android-camera?tab=readme-ov-file#contributing)
+- [Contributing for iOS](https://github.com/ionic-team/ion-ios-camera?tab=readme-ov-file#contributing)
+
+## Developing
+
+### Local Setup
+
+1. Fork and clone the repo.
+2. Install the dependencies to use the plugin.
+
+   ```shell
+   npm install
+   ```
+
+3. Install SwiftLint if you're on macOS.
+
+   ```shell
+   brew install swiftlint
+   ```
+
+### Scripts
+
+#### `npm run build`
+
+Build the plugin web assets and generate plugin API documentation using [`@capacitor/docgen`](https://github.com/ionic-team/capacitor-docgen).
+
+It will compile the TypeScript code from `src/` into ESM JavaScript in `dist/esm/`. These files are used in apps with bundlers when your plugin is imported.
+
+Then, Rollup will bundle the code into a single file at `dist/plugin.js`. This file is used in apps without bundlers by including it as a script in `index.html`.
+
+#### `npm run verify`
+
+Build and validate the web and native projects.
+
+This is run in CI to verify that the plugin builds for all platforms.
+
+#### `npm run lint` / `npm run fmt`
+
+Check formatting and code quality, autoformat/autofix if possible.
+
+The `lint` command is run in CI. We recommend running `lint` and/or `fmt` before opening a PR,
+
+## Commits/PR's
+
+Commits and PR's should use the [conventional-commits](https://www.conventionalcommits.org/) format so the release process can version and create changelog correctly.
+
+## Publishing
+
+Publishing is automated based on the branch committed to. When a commit or merge is made to a branch a release that corresponds with the branch will be created (main requires manual trigger):
+
+| Branch Name | Build Type                    | NPM Tag | Example NPM Version                |
+| ----------- | ----------------------------- | ------- | ---------------------------------- |
+| development | dev                           | dev     | @capacitor/camera@1.0.0-dev.1      |
+| next        | next (these are betas/alphas) | next    | @capacitor/camera@1.0.0-next.1     |
+| main        | latest                        | latest  | @capacitor/camera@1.0.0            |
+
+- In general new developments will go straight to `main`. If we want to have non-stable versions (e.g. for new Capacitor versions or when there are many changes), we may use `next` or `development` branch, and then once they are ready for stable version, open a PR to main (should be merged to keep commit hashes for `semantic-release`).
+
+> **Note**: The [`files`](https://docs.npmjs.com/cli/configuring-npm/package-json) array in `package.json` specifies which files get published. If you rename files/directories or add files elsewhere, you may need to update it.

CapacitorCamera.podspec

@@ -9,9 +9,10 @@ Pod::Spec.new do |s|
   s.license = package['license']
   s.homepage = 'https://capacitorjs.com'
   s.author = package['author']
-  s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
-  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}', 'camera/ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source = { :git => 'https://github.com/ionic-team/capacitor-camera.git', :tag => "v#{s.version}" }
+  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}',
   s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
+  s.dependency 'IONCameraLib', spec='~> 1.0.0'
   s.swift_version = '5.1'
 end

Package.swift

@@ -10,14 +10,16 @@ let package = Package(
             targets: ["CameraPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"),
+        .package(url: "https://github.com/ionic-team/ion-ios-camera.git", from: "1.0.0") 
     ],
     targets: [
         .target(
             name: "CameraPlugin",
             dependencies: [
                 .product(name: "Capacitor", package: "capacitor-swift-pm"),
-                .product(name: "Cordova", package: "capacitor-swift-pm")
+                .product(name: "Cordova", package: "capacitor-swift-pm"),
+                .product(name: "IONCameraLib", package: "ion-ios-camera")
             ],
             path: "ios/Sources/CameraPlugin"),
         .testTarget(