Skip to content

Commit 26a4f9a

Browse files
OS-pedrogustavobilroOS-pedrogustavobilro
committed
chore: Merge branch 'main' into next
2 parents 70dac46 + ea8200c commit 26a4f9a

File tree

6 files changed

+68
-29
lines changed

6 files changed

+68
-29
lines changed

‎.github/actions/prepare-example-app/action.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 'Prepare Example app'
2+
description: 'Does necessary pre-work for the example app to compile natively'
3+
4+
runs:
5+
using: 'composite'
6+
steps:
7+
- name: 'Build plugin'
8+
working-directory: ./packages/capacitor-plugin
9+
shell: bash
10+
run: npm run build
11+
- name: 'Install example app dependencies'
12+
working-directory: ./packages/example-app-capacitor
13+
shell: bash
14+
run: npm i
15+
- name: 'Build Web example app'
16+
working-directory: ./packages/example-app-capacitor
17+
shell: bash
18+
run: npm run build
19+
- name: 'Sync example app native platforms'
20+
working-directory: ./packages/example-app-capacitor
21+
shell: bash
22+
run: npx cap sync

‎.github/workflows/continuous_integration.yml‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,41 +16,54 @@ jobs:
1616
needs: 'setup'
1717
uses: ./.github/workflows/reusable_build.yml
1818

19-
verify-plugin:
19+
verify-plugin-android:
2020
needs: ['setup', 'lint', 'build']
21-
runs-on: 'macos-14'
21+
runs-on: 'macos-15'
2222
timeout-minutes: 30
2323
steps:
2424
- uses: actions/checkout@v4
2525
- name: 'Setup Tools'
2626
uses: ./.github/actions/setup-tools
27-
- name: 'Verify iOS + Android + Web'
27+
- name: 'Verify Android'
2828
working-directory: ./packages/capacitor-plugin
29-
run: npm run verify
29+
run: npm run verify:android
3030

31-
build-example-app:
32-
needs: ['verify-plugin']
33-
runs-on: 'macos-14'
31+
verify-plugin-ios:
32+
needs: ['setup', 'lint', 'build']
33+
runs-on: 'macos-15'
3434
timeout-minutes: 30
3535
steps:
3636
- uses: actions/checkout@v4
3737
- name: 'Setup Tools'
3838
uses: ./.github/actions/setup-tools
39-
- name: 'Build plugin'
39+
- name: 'Verify iOS'
4040
working-directory: ./packages/capacitor-plugin
41-
run: npm run build
42-
- name: 'Install example app dependencies'
43-
working-directory: ./packages/example-app-capacitor
44-
run: npm i
45-
- name: 'Build Web example app'
46-
working-directory: ./packages/example-app-capacitor
47-
run: npm run build
48-
- name: 'Sync example app native platforms'
49-
working-directory: ./packages/example-app-capacitor
50-
run: npx cap sync
41+
run: npm run verify:ios
42+
43+
build-example-app-android:
44+
needs: ['verify-plugin-ios', 'verify-plugin-android']
45+
runs-on: 'macos-15'
46+
timeout-minutes: 30
47+
steps:
48+
- uses: actions/checkout@v4
49+
- name: 'Setup Tools'
50+
uses: ./.github/actions/setup-tools
51+
- name: 'Prepare example app'
52+
uses: ./.github/actions/prepare-example-app
5153
- name: 'Build Android example app'
5254
working-directory: ./packages/example-app-capacitor/android
5355
run: ./gradlew clean assembleDebug
56+
57+
build-example-app-ios:
58+
needs: ['verify-plugin-ios', 'verify-plugin-android']
59+
runs-on: 'macos-15'
60+
timeout-minutes: 30
61+
steps:
62+
- uses: actions/checkout@v4
63+
- name: 'Setup Tools'
64+
uses: ./.github/actions/setup-tools
65+
- name: 'Prepare example app'
66+
uses: ./.github/actions/prepare-example-app
5467
- name: 'Build iOS example app'
5568
working-directory: ./packages/example-app-capacitor/ios/App
5669
run: xcodebuild clean build -workspace App.xcworkspace -scheme App CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## [1.0.5](https://github.com/ionic-team/capacitor-file-viewer/compare/v1.0.4...v1.0.5) (2025-10-08)
2+
3+
4+
### Bug Fixes
5+
6+
* **ios:** Opening local files without file:// ([#14](https://github.com/ionic-team/capacitor-file-viewer/issues/14)) ([ea3cab2](https://github.com/ionic-team/capacitor-file-viewer/commit/ea3cab2a3f92fe739d3009bbcaa27cb41209f759))
7+
* **ios:** Simplify SPM usage for native library ([#13](https://github.com/ionic-team/capacitor-file-viewer/issues/13)) ([d4f3d78](https://github.com/ionic-team/capacitor-file-viewer/commit/d4f3d7860ee4ecedaf23bd702426ba543f2407af))
8+
19
# [2.0.0-next.1](https://github.com/ionic-team/capacitor-file-viewer/compare/v1.0.4...v2.0.0-next.1) (2025-09-09)
210

311

‎packages/capacitor-plugin/CapacitorFileViewer.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Sources/FileViewerPlugin/*.{swift,h,m,c,cc,mm,cpp}'
1414
s.ios.deployment_target = '15.0'
15-
s.dependency 'IONFileViewerLib', spec='~> 1.0.1'
15+
s.dependency 'IONFileViewerLib', spec='~> 1.0.3'
1616
s.dependency 'Capacitor'
1717
s.swift_version = '5.1'
1818
end

‎packages/capacitor-plugin/Package.swift‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,16 @@ let package = Package(
1010
targets: ["FileViewerPlugin"])
1111
],
1212
dependencies: [
13-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
13+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0"),
14+
.package(url: "https://github.com/ionic-team/ion-ios-fileviewer.git", from: "1.0.3")
1415
],
1516
targets: [
16-
.binaryTarget(
17-
name: "IONFileViewerLib",
18-
url: "https://github.com/ionic-team/ion-ios-fileviewer/releases/download/1.0.1/IONFileViewerLib.zip",
19-
checksum: "2dcd0291e664ffbb5636119f147eda266e0d2284aa53a9c99925d0e442a0e92d" // sha-256
20-
),
2117
.target(
2218
name: "FileViewerPlugin",
2319
dependencies: [
2420
.product(name: "Capacitor", package: "capacitor-swift-pm"),
2521
.product(name: "Cordova", package: "capacitor-swift-pm"),
26-
"IONFileViewerLib"
22+
.product(name: "IONFileViewerLib", package: "ion-ios-fileviewer")
2723
],
2824
path: "ios/Sources/FileViewerPlugin"),
2925
.testTarget(

‎packages/example-app-capacitor/ios/App/Podfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ PODS:
66
- CapacitorCordova (8.0.0-alpha.2)
77
- CapacitorFileViewer (1.0.4):
88
- Capacitor
9-
- IONFileViewerLib (~> 1.0.1)
9+
- IONFileViewerLib (~> 1.0.3)
1010
- CapacitorSplashScreen (8.0.0-alpha.1):
1111
- Capacitor
12-
- IONFileViewerLib (1.0.1)
12+
- IONFileViewerLib (1.0.3)
1313

1414
DEPENDENCIES:
1515
- "Capacitor (from `../../node_modules/@capacitor/ios`)"
@@ -40,7 +40,7 @@ SPEC CHECKSUMS:
4040
CapacitorCordova: 9b60d7dd7f5035cefe9b5f7f3edf11ccd93b6ae6
4141
CapacitorFileViewer: 9ecc211750f424816165173a7caded128e58a4ce
4242
CapacitorSplashScreen: 6a9a07f9b1313faad49dde7bb8f12b7c4fcc3acf
43-
IONFileViewerLib: 9e6b09451afa7705545d4d20e2974b4f1555390c
43+
IONFileViewerLib: 574758ebcaa4b1543669b1c9708f1970e1172b29
4444

4545
PODFILE CHECKSUM: 77a7484d3339f92395579b7104fae0ab5447d5b7
4646

0 commit comments

Comments
 (0)