Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
9 changes: 4 additions & 5 deletions .github/actions/prepare-example-app/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ runs:
using: 'composite'
steps:
- name: 'Build plugin'
working-directory: ./packages/capacitor-plugin
shell: bash
run: npm run build
- name: 'Install example app dependencies'
working-directory: ./packages/example-app-capacitor
working-directory: ./example-app
shell: bash
run: npm i
- name: 'Build Web example app'
working-directory: ./packages/example-app-capacitor
working-directory: ./example-app
shell: bash
run: npm run build
- name: 'Sync example app native platforms'
working-directory: ./packages/example-app-capacitor
working-directory: ./example-app
shell: bash
run: npx cap sync
run: npx cap sync
3 changes: 1 addition & 2 deletions .github/actions/setup-tools/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ runs:
shell: bash
run: npm install -g npm@latest
- name: Install dependencies
working-directory: ./packages/capacitor-plugin
shell: bash
run: npm i
run: npm i
8 changes: 3 additions & 5 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
- name: 'Setup Tools'
uses: ./.github/actions/setup-tools
- name: 'Verify Android'
working-directory: ./packages/capacitor-plugin
run: npm run verify:android

verify-plugin-ios:
Expand All @@ -37,7 +36,6 @@ jobs:
- name: 'Setup Tools'
uses: ./.github/actions/setup-tools
- name: 'Verify iOS'
working-directory: ./packages/capacitor-plugin
run: npm run verify:ios

build-example-app-android:
Expand All @@ -51,7 +49,7 @@ jobs:
- name: 'Prepare example app'
uses: ./.github/actions/prepare-example-app
- name: 'Build Android example app'
working-directory: ./packages/example-app-capacitor/android
working-directory: ./example-app/android
run: ./gradlew clean assembleDebug

build-example-app-ios:
Expand All @@ -65,5 +63,5 @@ jobs:
- name: 'Prepare example app'
uses: ./.github/actions/prepare-example-app
- name: 'Build iOS example app'
working-directory: ./packages/example-app-capacitor/ios/App
run: xcodebuild clean build -workspace App.xcworkspace -scheme App CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
working-directory: ./example-app/ios/App
run: xcodebuild clean build -workspace App.xcworkspace -scheme App CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
1 change: 0 additions & 1 deletion .github/workflows/publish_pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ jobs:
npm run publish:cocoapod
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
working-directory: ./packages/capacitor-plugin
1 change: 0 additions & 1 deletion .github/workflows/release_plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
- name: 'Setup Tools'
uses: ./.github/actions/setup-tools
- name: Release
working-directory: ./packages/capacitor-plugin
env:
GITHUB_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
GH_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/reusable_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@ jobs:
uses: ./.github/actions/setup-tools

- name: "Copy README.md in root"
working-directory: ./packages/capacitor-plugin
run: cp README.md README.md.original

- name: "Build Packages"
working-directory: ./packages/capacitor-plugin
run: npm run build

- name: "Check README.md changes"
working-directory: ./packages/capacitor-plugin
run: |
if ! cmp --silent README.md README.md.original; then
echo "Detected README.md changes; Do 'npm run build' to update the docs."
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/reusable_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ jobs:
uses: ./.github/actions/setup-tools

- name: 'Lint Packages'
working-directory: ./packages/capacitor-plugin
run: npm run lint
run: npm run lint
66 changes: 65 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,70 @@
# node files
dist
node_modules

# iOS files
Pods
Podfile.lock
Package.resolved
.build
Build
xcuserdata
/.build
/Packages
xcuserdata/
DerivedData/
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc


# macOS files
.DS_Store



# Based on Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore

# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin
gen
out

# Gradle files
.gradle
build

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation

# Android Studio captures folder
captures

# IntelliJ
*.iml
.idea

# Keystore files
# Uncomment the following line if you do not want to check your keystore files in.
#*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
10 changes: 3 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@ This repository contains minimal code for native Android and iOS. The implementa
### Local Setup

1. Fork and clone the repo.
2. Go inside the plugin folder
```shell
cd packages/capacitor-plugin
```
3. Install the dependencies to use the plugin.
2. Install the dependencies to use the plugin.

```shell
npm install
```

4. Install SwiftLint if you're on macOS.
3. Install SwiftLint if you're on macOS.

```shell
brew install swiftlint
Expand Down Expand Up @@ -68,4 +64,4 @@ Publishing is automated based on the branch committed to. When a commit or merge

- 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 rebased to keep history).

> **Note**: The [`files`](https://docs.npmjs.com/cli/v7/configuring-npm/package-json#files) array in `package.json` specifies which files get published. If you rename files/directories or add files elsewhere, you may need to update it.
> **Note**: The [`files`](https://docs.npmjs.com/cli/v7/configuring-npm/package-json#files) array in `package.json` specifies which files get published. If you rename files/directories or add files elsewhere, you may need to update it.
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ Pod::Spec.new do |s|
s.homepage = package['repository']['url']
s.author = package['author']
s.source = { :git => package['repository']['url'], :tag => "v#{s.version}" }
s.source_files = [
'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}',
'packages/capacitor-plugin/ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
]
s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
s.ios.deployment_target = '15.0'
s.dependency 'Capacitor'
s.dependency 'IONFilesystemLib', spec='~> 1.1.0'
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ let package = Package(
.product(name: "Cordova", package: "capacitor-swift-pm"),
.product(name: "IONFilesystemLib", package: "ion-ios-filesystem")
],
path: "packages/capacitor-plugin/ios/Sources/FilesystemPlugin"),
path: "ios/Sources/FilesystemPlugin"),
.testTarget(
name: "FilesystemPluginTests",
dependencies: ["FilesystemPlugin"],
path: "packages/capacitor-plugin/ios/Tests/FilesystemPluginTests")
path: "ios/Tests/FilesystemPluginTests")
]
)
Loading