Skip to content

Commit

Permalink
Merge pull request #1 from chandu4002/fileTransferSyncFix
Browse files Browse the repository at this point in the history
file upload issue in sync file
  • Loading branch information
chandu4002 authored Nov 1, 2023
2 parents f12b73e + eb7be69 commit 7c639d5
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 30 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ jobs:
matrix:
versions:
# Test the lowest minimum supported APIs
- android: 7
android-api: 24
- android: 5.1
android-api: 22

# Test the last 3-4 supported APIs
- android: 10
Expand All @@ -67,6 +67,9 @@ jobs:
- android: 11
android-api: 30

- android: 12
android-api: 31

- android: 12L
android-api: 32

Expand Down Expand Up @@ -105,7 +108,7 @@ jobs:
if: ${{ endswith(env.repo, '/cordova-paramedic') != true }}
run: npm i -g github:apache/cordova-paramedic

- uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b
- uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e
env:
system-image-arch: ${{ matrix.versions.system-image-arch == '' && env.default_system-image-arch || matrix.versions.system-image-arch }}
system-image-target: ${{ matrix.versions.system-image-target == '' && env.default_system-image-target || matrix.versions.system-image-target }}
Expand All @@ -126,7 +129,7 @@ jobs:
working-directory: ./tests/server

- name: Run paramedic tests
uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b
uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e
env:
system-image-arch: ${{ matrix.versions.system-image-arch == '' && env.default_system-image-arch || matrix.versions.system-image-arch }}
system-image-target: ${{ matrix.versions.system-image-target == '' && env.default_system-image-target || matrix.versions.system-image-target }}
Expand All @@ -141,4 +144,4 @@ jobs:
force-avd-creation: false
disable-animations: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim
script: ${{ env.paramedic }} --config ./pr/local/${{ env.test_config }} --plugin ${{ env.test_plugin_path }}
script: ${{ env.paramedic }} --config ./pr/local/${{ env.test_config }} --plugin ${{ env.test_plugin_path }}
6 changes: 3 additions & 3 deletions .github/workflows/chrome.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
node-version: 16

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ env.node-version }}

Expand Down Expand Up @@ -77,4 +77,4 @@ jobs:
# Generally, this should automatically work for cordova-paramedic & plugins. If the path is unique, this can be manually changed.
test_plugin_path: ${{ endswith(env.repo, '/cordova-paramedic') && './spec/testable-plugin/' || './' }}
paramedic: ${{ endswith(env.repo, '/cordova-paramedic') && 'node main.js' || 'cordova-paramedic' }}
run: xvfb-run --auto-servernum ${{ env.paramedic }} --config ./pr/local/${{ env.test_config }} --plugin ${{ env.test_plugin_path }}
run: xvfb-run --auto-servernum ${{ env.paramedic }} --config ./pr/local/${{ env.test_config }} --plugin ${{ env.test_plugin_path }}
12 changes: 5 additions & 7 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,14 @@ jobs:
ios-version: 15.x
xcode-version: 13.x

- os-version: macos-12
ios-version: 16.x
xcode-version: 14.x


steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ env.node-version }}
- uses: maxim-lobanov/setup-xcode@9a697e2b393340c3cacd97468baa318e4c883d98
- uses: maxim-lobanov/setup-xcode@881be567d30efed8fb3f12b5099d68c3fb72aa3d
env:
xcode-version: ${{ matrix.versions.xcode-version == '' && env.default_xcode-version || matrix.versions.xcode-version }}
with:
Expand Down Expand Up @@ -105,4 +103,4 @@ jobs:
# Generally, this should automatically work for cordova-paramedic & plugins. If the path is unique, this can be manually changed.
test_plugin_path: ${{ endswith(env.repo, '/cordova-paramedic') && './spec/testable-plugin/' || './' }}
paramedic: ${{ endswith(env.repo, '/cordova-paramedic') && 'node main.js' || 'cordova-paramedic' }}
run: ${{ env.paramedic }} --config ./pr/local/${{ env.test_config }} --plugin ${{ env.test_plugin_path }}
run: ${{ env.paramedic }} --config ./pr/local/${{ env.test_config }} --plugin ${{ env.test_plugin_path }}
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
node-version: 16

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ env.node-version }}

Expand All @@ -53,4 +53,4 @@ jobs:
- name: Run lint test
run: |
npm run lint
npm run lint
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
"license": "Apache-2.0",
"engines": {
"cordovaDependencies": {
"2.0.0": {
"cordova-android": ">=12.0.0"
},
"3.0.0": {
"cordova": ">100"
}
Expand All @@ -41,4 +38,4 @@
"devDependencies": {
"@cordova/eslint-config": "^5.0.0"
}
}
}
8 changes: 2 additions & 6 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@
<repo>https://github.com/apache/cordova-plugin-file-transfer</repo>
<issue>https://github.com/apache/cordova-plugin-file-transfer/issues</issue>

<engines>
<engine name="cordova-android" version=">=12.0.0" />
</engines>

<dependency id="cordova-plugin-file" version="^8.0.0" />
<dependency id="cordova-plugin-file" version=">=7.0.0" />

<js-module src="www/FileTransferError.js" name="FileTransferError">
<clobbers target="window.FileTransferError" />
Expand Down Expand Up @@ -75,4 +71,4 @@
<clobbers target="window.FileTransfer" />
</js-module>
</platform>
</plugin>
</plugin>
4 changes: 2 additions & 2 deletions tests/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-file-transfer-tests",
"version": "2.0.1-dev",
"version": "1.6.3-dev",
"description": "",
"cordova": {
"id": "cordova-plugin-file-transfer-tests",
Expand All @@ -11,4 +11,4 @@
],
"author": "",
"license": "Apache 2.0"
}
}

0 comments on commit 7c639d5

Please sign in to comment.