Resolve issue with plugin target-dir="app*" subdirs #572

brodycj · 2018-11-22T12:28:21Z

(subdirectories) such as "appco", with unit tests to verify correct operation

Needed for @katzer plugins that use de/appplant subdirectory, for example:

https://github.com/katzer/cordova-plugin-local-notifications, with target-dir="src/de/appplant/cordova/plugin/notification"
https://github.com/katzer/cordova-plugin-badge, with target-dir="src/de/appplant/cordova/plugin/badge"
https://github.com/katzer/cordova-plugin-background-mode, with target-dir="src/de/appplant/cordova/plugin/background"

Also needed for cordova-plugin-inappbrowser

Resolves #571

@katzer

such as "appco", with unit tests to verify Needed for @katzer plugins that use de/appplant subdirectory, for example: * cordova-plugin-local-notifications * cordova-plugin-badge * cordova-plugin-background-mode Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Julio César <[email protected]>

spec/unit/pluginHandlers/handlers.spec.js

kamilbrk · 2018-11-22T12:39:38Z

FYI the inappbrowser plugin is affected, does not load at all on 7.1.3

codecov-io · 2018-11-22T12:40:33Z

Codecov Report

Merging #572 into master will not change coverage.
The diff coverage is 100%.

@@           Coverage Diff           @@
##           master     #572   +/-   ##
=======================================
  Coverage   62.11%   62.11%           
=======================================
  Files          17       17           
  Lines        1985     1985           
  Branches      371      371           
=======================================
  Hits         1233     1233           
  Misses        752      752

Impacted Files	Coverage Δ
bin/templates/cordova/lib/pluginHandlers.js	`87.13% <100%> (ø)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a014228...688bf03. Read the comment docs.

Co-Authored-By: brodybits <[email protected]>

brodycj · 2018-11-22T12:55:43Z

Thanks @janpio for the review. I got a call in 5 minutes, will test with more plugins and merge afterwards.

brodycj · 2018-11-22T12:56:44Z

And thanks to @kamilbrk for pointing out the issue with cordova-plugin-inappbrowser.

brodycj · 2018-11-22T13:49:52Z

Tested in a new Cordova project

reproduced using cordova-android@latest (7.1.3)

cordova platform add android@latest
cordova plugin add cordova-plugin-inappbrowser

then the plugin Java files were incorrectly installed in the following relative directory path: platforms/android/src/org/apache/cordova/inappbrowser

Verified on proposed bug fix

cordova platform add https://github.com/brodybits/cordova-android#app-subdir-bugfix (based on the master branch, which includes bleeding-edge updates for Cordova 9)
cordova plugin add cordova-plugin-inappbrowser

then the plugin Java files are correctly installed in the following relative directory path: platforms/android/app/src/main/java/org/apache/cordova/inappbrowser

I also tested that cordova-plugin-inappbrowser Java files install correctly on [email protected].

Merging now.

P.S. Some additional testing done after merge:

Tried cordova-plugin-badge with 7.1.3, https://github.com/apache/cordova-android#master, and 7.1.2

Reproduced issue on 7.1.3, resolved on https://github.com/apache/cordova-android#master, no issue observed on 7.1.2.

@katzer

(subdirectories) such as "appco", with unit tests to verify Needed for @katzer plugins that use de/appplant subdirectory, for example: * cordova-plugin-local-notifications * cordova-plugin-badge * cordova-plugin-background-mode Also needed for cordova-plugin-inappbrowser Co-authored-by: Christopher J. Brody <[email protected]> Co-authored-by: Julio César <[email protected]> Co-authored-by: Jan Piotrowski <[email protected]>

Use startsWith instead of `includes` to check for remapping of `target-dir` that starts with `libs` or `src/main` (Followup to PR apache#572)

Use `startsWith` instead of `includes` to check for remapping of `target-dir` that starts with `libs` or `src/main` (Followup to PR apache#572)

brodycj · 2018-11-23T19:33:59Z

7.1.4 patch release is now published to resolve the issue.

brodycj requested review from janpio and jcesarmobile November 22, 2018 12:28

janpio reviewed Nov 22, 2018

View reviewed changes

spec/unit/pluginHandlers/handlers.spec.js Outdated Show resolved Hide resolved

janpio reviewed Nov 22, 2018

View reviewed changes

spec/unit/pluginHandlers/handlers.spec.js Outdated Show resolved Hide resolved

janpio and others added 2 commits November 22, 2018 07:48

SQUASH-FIX: Update spec/unit/pluginHandlers/handlers.spec.js

ae98b2e

Co-Authored-By: brodybits <[email protected]>

SQUASH-FIX: Update spec/unit/pluginHandlers/handlers.spec.js

9bb08bb

Co-Authored-By: brodybits <[email protected]>

janpio changed the title ~~Resolve issue with plugin target-dir "app*" subdirectories such as "appco"~~ Fix issue with plugin target-dir "app*" subdirectories such as "appco" Nov 22, 2018

janpio approved these changes Nov 22, 2018

View reviewed changes

brodycj mentioned this pull request Nov 22, 2018

Plugin is not correctly installed if the package contains "app" #571

Closed

brodycj changed the title ~~Fix issue with plugin target-dir "app*" subdirectories such as "appco"~~ Resolve issue with plugin target-dir "app*" subdirectories such as "appco" Nov 22, 2018

brodycj changed the title ~~Resolve issue with plugin target-dir "app*" subdirectories such as "appco"~~ Resolve issue with plugin target-dir "app*" subdirs Nov 22, 2018

brodycj changed the title ~~Resolve issue with plugin target-dir "app*" subdirs~~ Resolve issue with plugin target-dir="app*" subdirs Nov 22, 2018

brodycj merged commit ef24341 into apache:master Nov 22, 2018

brodycj deleted the app-subdir-bugfix branch November 22, 2018 13:59

brodycj mentioned this pull request Nov 22, 2018

7.1.4 patch updates #573

Merged

brodycj pushed a commit to brodycj/cordova-android that referenced this pull request Nov 23, 2018

Other target-dir remapping fixes

87a202d

Use startsWith instead of `includes` to check for remapping of `target-dir` that starts with `libs` or `src/main` (Followup to PR apache#572)

brodycj pushed a commit to brodycj/cordova-android that referenced this pull request Nov 23, 2018

Other target-dir remapping fixes

9bd952f

Use `startsWith` instead of `includes` to check for remapping of `target-dir` that starts with `libs` or `src/main` (Followup to PR apache#572)

This was referenced Nov 23, 2018

Other target-dir remapping fixes #577

Closed

Deprecate old plugin target-dir structure support #580

Open

terangel mentioned this pull request Nov 26, 2018

Fix the target location (target-dir) of the file "IInAppBillingService.aidl" for version 7.0.0 of Android. AlexDisler/cordova-plugin-inapppurchase#207

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolve issue with plugin target-dir="app*" subdirs #572

Resolve issue with plugin target-dir="app*" subdirs #572

brodycj commented Nov 22, 2018 •

edited

Loading

kamilbrk commented Nov 22, 2018

codecov-io commented Nov 22, 2018

brodycj commented Nov 22, 2018

brodycj commented Nov 22, 2018

brodycj commented Nov 22, 2018 •

edited

Loading

brodycj commented Nov 23, 2018

Resolve issue with plugin target-dir="app*" subdirs #572

Resolve issue with plugin target-dir="app*" subdirs #572

Conversation

brodycj commented Nov 22, 2018 • edited Loading

kamilbrk commented Nov 22, 2018

codecov-io commented Nov 22, 2018

Codecov Report

brodycj commented Nov 22, 2018

brodycj commented Nov 22, 2018

brodycj commented Nov 22, 2018 • edited Loading

Tested in a new Cordova project

reproduced using cordova-android@latest (7.1.3)

Verified on proposed bug fix

brodycj commented Nov 23, 2018

brodycj commented Nov 22, 2018 •

edited

Loading

brodycj commented Nov 22, 2018 •

edited

Loading