7.1.3 patch updates #555

brodycj · 2018-11-14T12:57:45Z

Changes ported

Incorrect default sdk version issue fix (PR Incorrect default sdk version issue fix #495) & update comments in build.gradle (PR Update comments in build.gradle #496)
Remove obsolete check for JellyBean to work properly on Android Pie (User agent check in Cordova.js raises exception in Android 9 #534) (PR Remove obsolete check for JellyBean (GH-534) #544)
Fix dest overwrite #539 & Issue to copy library from plugin after updating to v7.1.2 #540 fix destination path fallback & fix for source-file with app target-dir, with unit test updates (PR Resolve GH-539 & GH-540 on master #542)
Compatibility of old plugins with non-Java source-file entries (individual files) #547 fixes, with unit test updates from PR Fix for old plugins with non-Java sources (GH-547) #550
add missing cast for cdvMinSdkVersion ((android) add missing cast for cdvMinSdkVersion #551)
Multiple build-extras.gradle locations (Cordova project ignores build-extras after toolchain upgrade #552)

How tested

npm test

npm run unit-tests succeeds
npm test succeeds in Travis CI and AppVeyor CI

cordova-sqlite-storage 2.1.5

In a clone of https://github.com/brodybits/cordova-sqlite-test-app

cordova platform add https://github.com/brodybits/cordova-android#7.1.3-patch-updates
cordova plugin add cordova-sqlite-storage@2.1.5
Able to build and run on a test device
Click on self test button results in an alert that the self test is OK (self test of SQLite CRUD operations in sqlite plugin)
cordova plugin remove cordova-sqlite-storage is successful

Other plugins tested

Add plugin, build, and remove plugin tested for:

cordova-plugin-deezer
https://github.com/adjust/cordova_sdk#master
https://github.com/adjust/cordova_sdk#cordova-8
https://github.com/dylearning/cordova-plugin-hikvisionVedio#master
https://github.com/j3k0/cordova-plugin-purchase#v7.1.0 (old version, without adaptations that were needed for cordova-android@7.0.0)

jcesarmobile · 2018-11-14T23:15:00Z

I don't see #551 fix in the resulting changes

brodycj · 2018-11-14T23:26:42Z

I don't see #551 fix in the resulting changes

Just added it, thanks for catching it!

FYI This PR is still marked as WIP since I would like to test on a couple plugins before merging.

brodycj · 2018-11-15T04:14:21Z

I just finished testing the patch updates with some plugins listed in the OP description, quick review would be appreciated.

brodycj · 2018-11-15T10:19:22Z

I just pushed a change to remove the GH-547 fix for aidl files. This means that plugins such as cordova-plugin-purchase would need to keep multiple aidl source-file entries to support both cordova-android@6 and cordova-android@latest.

This is needed to avoid breaking plugins such as cordova-plugin-purchase in a patch release. I suspect we should push this change to master to avoid breaking plugins such as cordova-plugin-purchase in the foreseeable future.

jcesarmobile · 2018-11-15T10:24:57Z

This PR is to cherry-pick master changes to 7.1.x, if you push changes here before being on master, then it's not a cherry-pick anymore.
If the current patch for aidl files doesn't work well report an issue explaining it better (as by your comment I don't know what's wrong with this approach) and fix it in master first, and then we can cherry-pick on this branch.

brodycj · 2018-11-15T10:31:26Z

Back to WIP for now

brodycj · 2018-11-15T12:58:06Z

Waiting for final approval of #561, which is expected to be merged as a merge commit. I will include the merge commit in this proposal once it is available.

brodycj · 2018-11-16T16:26:28Z

I just put the changes in almost the same order as they appear in master and removed "[WIP]" from the title, think it should be merged now. Any objections?

janpio · 2018-11-16T17:43:50Z

Maybe silly question, but what would be a way to compare master and this branch to see if the cherry-picked commits make sense and nothing is missing etc?

Second question: With 18 commits, wouldn't it make more sense to make this 7.2.0? Is this still just a patch release with so much content?

jcesarmobile · 2018-11-16T18:01:27Z

No, because master have a lot more fixes that won't go into 7.1.3, so you can't directly compare

Also no to 7.2.0, this is supposedly a patch, and doing a minor bump will prevent the cli from getting this version that patches some bugs we caused in previous release

Will review later tonight

as followup to apacheGH-495

to work properly on Android Pie was introduced in dc0bfeb (CB-11828) Resolves apache#534 Co-authored-by: <pradiv-kumar@users.noreply.github.com> Co-authored-by: Christopher J. Brody <chris.brody@gmail.com>

…ache#542)

for Java source only (apacheGH-539) Co-Authored-By: Christopher J. Brody <chris.brody@gmail.com> Co-Authored-By: Kyle Kirbatski <kkirbatski@gmrmarketing.com>

Fallback to old path mapping if no Android Studio path mapping exists (with slight difference on 7.1.x branch) Co-authored-by: Christopher J. Brody <chris.brody@gmail.com> Co-authored-by: Kyle Kirbatski <kkirbatski@gmrmarketing.com>

@afdev82

for JAR and AAR (apacheGH-540) Co-Authored-By: Kyle Kirbatski <kkirbatski@gmrmarketing.com> Co-Authored-By: Christopher J. Brody <chris.brody@gmail.com> Co-Authored-By: @afdev82 (Antonio Facciolo)

for Java source, JAR, and AAR Co-authored-by: Christopher J. Brody <chris.brody@gmail.com> Co-authored-by: Kyle Kirbatski <kkirbatski@gmrmarketing.com> Co-authored-by: Antonio Facciolo <afdev82@users.noreply.github.com>

(new app target-dir scheme)

Possibly related to: CB-13830: Add handlers for plugins that use non-Java source files, such as Camera

of plugin source file installed into app/src/main with old target-dir scheme NOTE: These tests do *not* check compatibility of plugins with old lib target-dir scheme.

(reproduces apacheGH-547)

(in pluginHandlers.js)

(source-file entries) including aidl, aar, jar, and so files

…t directory (apache#553) as documented in https://cordova.apache.org/docs/en/latest/guide/platforms/android/?#extending-buildgradle and deal with multiple build-extras.gradle locations Co-authored-by: David Boho <david.boho@tu-ilmenau.de> Co-authored-by: Christopher J. Brody <chris.brody@gmail.com>

brodycj · 2018-11-16T18:33:15Z

I just updated the changes as follows:

moved a couple gradle updates to the end
added number of original PR on master where it was not present

I also updated the description to list the changes in the same order as they appear in this PR.

I hope this makes it easier to check what changes are in this PR. Thanks @jcesarmobile for your efforts to check the changes in both branches.

jcesarmobile

LGTM

brodycj · 2018-11-18T00:33:43Z

Thanks @jcesarmobile!

brodycj requested review from dpogue and jcesarmobile November 14, 2018 12:57

brodycj force-pushed the 7.1.3-patch-updates branch from bbe5fc6 to b76ee35 Compare November 14, 2018 13:46

This was referenced Nov 14, 2018

cordova android build error - The "path" argument must be of type string j3k0/cordova-plugin-purchase#756

Closed

Fix for old plugins with non-Java sources (GH-547) #550

Merged

brodycj changed the title ~~[WIP] 7.1.3 patch updates - proposed~~ 7.1.3 patch updates - proposed Nov 14, 2018

brodycj changed the title ~~7.1.3 patch updates - proposed~~ [WIP] 7.1.3 patch updates - proposed WIP Nov 14, 2018

brodycj changed the title ~~[WIP] 7.1.3 patch updates - proposed WIP~~ 7.1.3 patch updates Nov 15, 2018

brodycj mentioned this pull request Nov 15, 2018

Small update will be needed for proposed cordova-android patch release j3k0/cordova-plugin-purchase#759

Closed

brodycj changed the title ~~7.1.3 patch updates~~ [WIP] 7.1.3 patch updates Nov 15, 2018

brodycj force-pushed the 7.1.3-patch-updates branch from 6c67121 to 7f6a70a Compare November 15, 2018 12:49

brodycj mentioned this pull request Nov 16, 2018

Compatibility of old plugins with non-Java source-file entries (individual files) #547

Closed

brodycj force-pushed the 7.1.3-patch-updates branch from 7f6a70a to e4acf55 Compare November 16, 2018 16:07

brodycj changed the title ~~[WIP] 7.1.3 patch updates~~ 7.1.3 patch updates Nov 16, 2018

brodycj force-pushed the 7.1.3-patch-updates branch from e4acf55 to d0dbe86 Compare November 16, 2018 18:19

Darshan-Chauhan and others added 5 commits November 16, 2018 13:22

Incorrect default sdk version issue fix (PR apache#495)

00134cf

Update comments (apache#496)

dbc99e8

as followup to apacheGH-495

Remove obsolete check for JellyBean (apacheGH-534) (apache#544)

9f6c332

to work properly on Android Pie was introduced in dc0bfeb (CB-11828) Resolves apache#534 Co-authored-by: <pradiv-kumar@users.noreply.github.com> Co-authored-by: Christopher J. Brody <chris.brody@gmail.com>

Add a unit test to test source-file target-dir /app/src/main/… (PR ap…

c0e9f25

…ache#542)

unit test uninstall of <source-file> with app dest (PR apache#542)

55f2986

for Java source only (apacheGH-539) Co-Authored-By: Christopher J. Brody <chris.brody@gmail.com> Co-Authored-By: Kyle Kirbatski <kkirbatski@gmrmarketing.com>

Christopher J. Brody and others added 13 commits November 16, 2018 13:22

unit test source-file with custom lib target-dir (PR apache#542)

f8584c6

for JAR and AAR (apacheGH-540) Co-Authored-By: Kyle Kirbatski <kkirbatski@gmrmarketing.com> Co-Authored-By: Christopher J. Brody <chris.brody@gmail.com> Co-Authored-By: @afdev82 (Antonio Facciolo)

apacheGH-540 fix for source-file with app target-dir (PR apache#542)

717d768

Fix tests of plugin files with new app dir scheme (PR apache#542)

5222a0f

(new app target-dir scheme)

Check target-dir mapping of plugin xml source file (PR apache#550)

e3468c6

Possibly related to: CB-13830: Add handlers for plugins that use non-Java source files, such as Camera

Check old compat of other extension (CB-14125) (PR apache#550)

dea6846

of plugin source file installed into app/src/main with old target-dir scheme NOTE: These tests do *not* check compatibility of plugins with old lib target-dir scheme.

Test old plugin aidl & lib mapping - repros apacheGH-547 (PR apache#550)

9537e34

(reproduces apacheGH-547)

Cleanup getInstallDestination in pluginHandlers.js (PR apache#550)

07e1fe1

Fix comments in getInstallDestination (PR apache#550)

298f1e3

(in pluginHandlers.js)

apacheGH-547 Fix for old plugins with non-Java sources (PR apache#550)

9848aa8

(source-file entries) including aidl, aar, jar, and so files

add missing cast for cdvMinSdkVersion (apacheGH-551)

0ebc9a6

brodycj force-pushed the 7.1.3-patch-updates branch from d0dbe86 to 32e3eae Compare November 16, 2018 18:23

jcesarmobile approved these changes Nov 16, 2018

View reviewed changes

brodycj removed the request for review from dpogue November 18, 2018 00:31

brodycj merged commit 442734d into apache:7.1.x Nov 18, 2018

brodycj deleted the 7.1.3-patch-updates branch November 18, 2018 00:33

brodycj mentioned this pull request Nov 19, 2018

Add blog post for upcoming cordova-android@7.1.3 patch release apache/cordova-docs#911

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

7.1.3 patch updates #555

7.1.3 patch updates #555

brodycj commented Nov 14, 2018 •

edited

Loading

jcesarmobile commented Nov 14, 2018

brodycj commented Nov 14, 2018

brodycj commented Nov 15, 2018

brodycj commented Nov 15, 2018

jcesarmobile commented Nov 15, 2018

brodycj commented Nov 15, 2018

brodycj commented Nov 15, 2018

brodycj commented Nov 16, 2018

janpio commented Nov 16, 2018 •

edited

Loading

jcesarmobile commented Nov 16, 2018

brodycj commented Nov 16, 2018

jcesarmobile left a comment

brodycj commented Nov 18, 2018

7.1.3 patch updates #555

7.1.3 patch updates #555

Conversation

brodycj commented Nov 14, 2018 • edited Loading

Changes ported

How tested

npm test

cordova-sqlite-storage 2.1.5

Other plugins tested

jcesarmobile commented Nov 14, 2018

brodycj commented Nov 14, 2018

brodycj commented Nov 15, 2018

brodycj commented Nov 15, 2018

jcesarmobile commented Nov 15, 2018

brodycj commented Nov 15, 2018

brodycj commented Nov 15, 2018

brodycj commented Nov 16, 2018

janpio commented Nov 16, 2018 • edited Loading

jcesarmobile commented Nov 16, 2018

brodycj commented Nov 16, 2018

jcesarmobile left a comment

Choose a reason for hiding this comment

brodycj commented Nov 18, 2018

brodycj commented Nov 14, 2018 •

edited

Loading

janpio commented Nov 16, 2018 •

edited

Loading