GitHub user infil00p opened a pull request:
https://github.com/apache/cordova-android/pull/389
CB-11244: Studio Project Compatibility: Now with merge commit
<!--
Please make sure the checklist boxes are all checked before submitting the
PR. The checklist
is intended as a quick reference, for complete details please see our
Contributor Guidelines:
http://cordova.apache.org/contribute/contribute_guidelines.html
Thanks!
-->
### Platforms affected
Android
### What does this PR do?
This PR is the new current working PR for the Studio Project work
### What testing has been done on this change?
Tested against the CI tests, more tests need to be added.
### Checklist
- [x ] [Reported an
issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database
- [ ] Commit message follows the format: "CB-3232: (android) Fix bug with
resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform
affected.
- [] Added automated test coverage as appropriate for this change.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/infil00p/cordova-android StudioProjectCompat
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cordova-android/pull/389.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #389
----
commit d88df59c32ae7d1a55729477f5a22d9e7b4df111
Author: Joe Bowser <[email protected]>
Date: 2017-03-30T19:41:44Z
Adding the Studio Builder to build a project based on Android Studio,
and deleting Ant, since Google does not support Ant Builds anymore.
Sorry guys!
commit 23d8d999257f9cf1331d81489c96f00fa134b3b5
Author: Joe Bowser <[email protected]>
Date: 2017-03-30T20:38:18Z
Moving Android Manifest finding to the Gradle and Studio builders.
commit ffadf5dd51767c2f2697ad9e1ba34cf44d652145
Author: Joe Bowser <[email protected]>
Date: 2017-04-03T22:21:48Z
Changing this so we pass lint
commit 7b17abc5553ca14f69081a2175f787d4a0550f0f
Author: Joe Bowser <[email protected]>
Date: 2017-04-04T20:38:40Z
Fixing linting issues
commit f790aeb8f677eb047ce6e82fceaeb814cfc9d4fc
Author: Joe Bowser <[email protected]>
Date: 2017-04-04T22:18:46Z
Setting up the create command so we actually have all the directories in
the right place, and define default variables in the top level build.gradle
commit b73c04f3c8424e6db57c3bb98c550cd4d976f473
Author: Joe Bowser <[email protected]>
Date: 2017-04-04T22:34:42Z
Updating gradle version in the build file
commit 8ead919faea814e86e8f665e9122a35bcd82d869
Author: Joe Bowser <[email protected]>
Date: 2017-04-04T22:42:58Z
Managed to get the project to mostly compile, still need to re-work the
build command to add the app project
commit db87e0ae6a25d8a337d10b41cb46574e2cb987b0
Author: Joe Bowser <[email protected]>
Date: 2017-04-11T20:47:40Z
Made changes so cordova/build builds with the new project. Need to work on
plugin installation.
commit a216f0db751778953224067f25b8e0077bb7e760
Author: Joe Bowser <[email protected]>
Date: 2017-01-04T19:48:18Z
CB-11244: Changing directory creation, will most likely hide this behind a
flag for the next release of Cordova-Android, and then make it default in the
next major pending feedback
commit 69260fb96a8d606549caa8880abc5e7b444c4621
Author: Joe Bowser <[email protected]>
Date: 2017-04-11T21:41:27Z
Fix the overwriting of Fil's fix, blargh
commit 69ab6a0e0d70e56c6fe0fe7529a211c51df09ab7
Author: Joe Bowser <[email protected]>
Date: 2017-04-18T21:29:02Z
Changing the project to add the app directory as a dependency
commit 8391af2e8f6d9bdab102f28c58f257b8b53d0c0f
Author: Joe Bowser <[email protected]>
Date: 2017-04-18T21:48:56Z
JsHint Fixes, deleting unused methods
commit 304a8991140f3f1ed76a9816b1a4d701537f89ea
Author: Joe Bowser <[email protected]>
Date: 2017-04-19T18:50:55Z
Fixed the specification of the builders in the run command by getting build
to check what was being passed from run
commit e621edfba755d31915da29a6113b0be2db56735f
Author: Joe Bowser <[email protected]>
Date: 2017-04-21T23:27:26Z
Fixing the Android Studio detection and making it automatically pick the
right builder, good for upgrading Cordova
commit bd4ddcdeddf7a5b232023c4f53b60d2ab20e7a48
Author: Joe Bowser <[email protected]>
Date: 2017-04-22T00:02:27Z
Updated AndroidStudio to only look for the app directory to determine
studio status
commit 28ebbb8f024f31a627af6b26ba23e41e7ce22f65
Author: Joe Bowser <[email protected]>
Date: 2017-05-31T17:23:35Z
CB-11244: Setup Api.js to support multiple builders based on project
structure
commit fb6cb51e64a2ea05ba65195023b702fb00b378c2
Author: Joe Bowser <[email protected]>
Date: 2017-05-31T17:37:47Z
Fixing lint errors
commit 8f16df4c90bd4a9ea64f537d85db5ce6069b5c04
Author: Joe Bowser <[email protected]>
Date: 2017-06-13T15:27:46Z
Adding logic to upgrade both Classic and Android Studio style project
structures
commit 33feb00e8f383cd99ce59a052171d6d35c61094c
Author: Joe Bowser <[email protected]>
Date: 2017-06-13T17:11:41Z
Adding the if statement to see if we can support both structures with
minimal editing, TODO: actually write tests for this somehow
commit c74192d578e647a8386ac8663d6c99521f28b110
Author: Joe Bowser <[email protected]>
Date: 2017-06-13T17:36:00Z
Adding conditional code into Gradle, this is a bit dirty since we can't
explicitly test it but we'll just have to rely on jasmine
commit b67e9905bccde0b6188bd2c6f16dae34d09b9d35
Author: Joe Bowser <[email protected]>
Date: 2017-06-13T18:58:00Z
This is probably a bad idea, but we need to split the gradle files into
legacy and new style
commit 40c9709445ef77fa97cc8d2d65cc961860a3046e
Author: Joe Bowser <[email protected]>
Date: 2017-06-14T16:34:15Z
OK, Going back to the old build.gradle for legacy projects
commit c0474e811dd6387beefe8b5b5b036ee773a87126
Author: Joe Bowser <[email protected]>
Date: 2017-06-14T17:16:05Z
Bump for travis test
commit 49b76f5c7138684455af69b030bce71f290de31f
Author: Joe Bowser <[email protected]>
Date: 2017-06-14T18:36:43Z
Fixing mangled commits that crept into this branch
commit 1cda7a9de000bc71f920412286646803fa539ef4
Author: Joe Bowser <[email protected]>
Date: 2017-06-19T21:34:03Z
CB-11244: Found bug in Api.js where xml/strings.xml is used instead of
values/strings.xml
commit b20028c42b0363ec27df304ba74a7d3d6003ad9f
Author: Joe Bowser <[email protected]>
Date: 2017-06-22T20:46:18Z
The prepare step was broken, which breaks the CLI workflow. This was
caused by hardcoding the Java directory, which is a very bad idea.
commit e456175a815e2812c1ce249d7460cbe8dfe340a2
Author: Joe Bowser <[email protected]>
Date: 2017-06-26T17:29:31Z
Merge branch 'master' into StudioProjectCompat
This will have to be linted
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
