You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2017/11/29 17:55:42 UTC

[cordova-android] branch master updated (3ad1ed7 -> 59018ab)

This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git.


    from 3ad1ed7  Merge pull request #418 from dpogue/splash-compress
     add d88df59  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!
     add 23d8d99  Moving Android Manifest finding to the Gradle and Studio builders.
     add ffadf5d  Changing this so we pass lint
     add 7b17abc  Fixing linting issues
     add f790aeb  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
     add b73c04f  Updating gradle version in the build file
     add 8ead919  Managed to get the project to mostly compile, still need to re-work the build command to add the app project
     add db87e0a  Made changes so cordova/build builds with the new project.  Need to work on plugin installation.
     add 69260fb  Fix the overwriting of Fil's fix, blargh
     add a216f0d  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
     add 69ab6a0  Changing the project to add the app directory as a dependency
     add 8391af2  JsHint Fixes, deleting unused methods
     add 304a899  Fixed the specification of the builders in the run command by getting build to check what was being passed from run
     add e621edf  Fixing the Android Studio detection and making it automatically pick the right builder, good for upgrading Cordova
     add bd4ddcd  Updated AndroidStudio to only look for the app directory to determine studio status
     add 28ebbb8  CB-11244: Setup Api.js to support multiple builders based on project structure
     add fb6cb51  Fixing lint errors
     add 8f16df4  Adding logic to upgrade both Classic and Android Studio style project structures
     add 33feb00  Adding the if statement to see if we can support both structures with minimal editing, TODO: actually write tests for this somehow
     add c74192d  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
     add b67e990  This is probably a bad idea, but we need to split the gradle files into legacy and new style
     add 40c9709  OK, Going back to the old build.gradle for legacy projects
     add c0474e8  Bump for travis test
     add 49b76f5  Fixing mangled commits that crept into this branch
     add 1cda7a9  CB-11244: Found bug in Api.js where xml/strings.xml is used instead of values/strings.xml
     add b20028c  The prepare step was broken, which breaks the CLI workflow.  This was caused by hardcoding the Java directory, which is a very bad idea.
     add e456175  Merge branch 'master' into StudioProjectCompat
     add a7304b9  Finishing the linting
     add 245d9a1  Merge branch 'master' into StudioProjectCompat
     add 849b887  Merge branch 'master' into StudioProjectCompat
     add 99f15c5  Updating paths in the unit tests, leaving the failing test and coding against that
     add fdd7eb3  Linting fix
     add b65af10  Make the tests pass
     add 00c879e  It passed then failed.  I'll change the test for now, because perfect is the enemy of good.
     add d0dab4b  Merge branch 'master' into StudioProjectCompat
     add 5fe9557  Merge branch 'master' into StudioProjectCompat
     add 46905eb  Merge branch 'master' into StudioProjectCompat.  Dealing with latest commits merged into master.
     add e91b19d  Fixing error caused by merge commit
     add 8fdb16c  Fixing cordova-cli related bug
     add f18086f  Merge branch 'master' into StudioProjectCompat
     add 0d98e09  Merge branch 'master' into StudioProjectCompat
     add 7d28242  Merge branch 'master' into StudioProjectCompat
     add b1f527e  Merge branch 'master' into StudioProjectCompat
     add 2534a3c  CB-11244: Added remapping for drawables
     add f3c238d  CB-11244: Adding specs for resource files inside an Android Studio Project
     add 8743e88  CB-11244: Fixing eslint errors
     add 6cf6e20  Merge branch 'master' into StudioProjectCompat, fixing conflicts, need to re-add previous PR fix on the branch
     add 6ccd6b0  Redoing PR #411 over here because the changes were obliterated from earlier
     add cbee858  CB-13470: Fix Clean so that it cleans the Android Studio structure
     add 3ba00f9  eslint errors
     add f50ca85  CB-11244: Found bug where the gradle subproject changes weren't actually getting written to the correct gradle file
     add 8ba0109  Completing merge which includes the fix for Android Studio 3.0
     add 18d6884  CB-11244: Android Studio 3 work, things have changed with how the platform is built
     add f54336e  eslint fix
     add b77febc  Merge branch 'master' into StudioProjectCompat
     add 3acba59  CB-13297: This just works once you bump the project structure.  Java 1.8 compatibility baked-in
     add 2930900  Merge branch 'master' into StudioProjectCompat
     add 43956c1  Merge branch 'master' into StudioProjectCompat
     add 5d57eff  CB-13601: Fixing the standalone run scripts to make sure this works without using the CLI
     add d8f10c3  CB-13601: Fixing lint error and mis-spelling of variable
     add 9d9bac3  CB-13602: We were setting the path wrong, this is hacky but it works
     add 30c3713  Merge branch 'master' into StudioProjectCompat
     add 2b20802  Merge branch 'master' into StudioProjectCompat
     add 4863320  Merge branch 'master' into StudioProjectCompat
     add 0269e53  CB-13741: Bump package.json so we can install plugins
     add a9e01f4  CB-13612: Fix the remapper so that XML files copy over and the Camera works again.
     add adc7dab  CB-13612: eslint fix
     add c6cfeb1  Fixed typo in the gradle file
     new 59018ab  Merge pull request #389 from infil00p/StudioProjectCompat

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/lib/create.js                                  |  78 +++--
 bin/templates/cordova/Api.js                       |  25 +-
 bin/templates/cordova/lib/AndroidStudio.js         |   4 +-
 bin/templates/cordova/lib/build.js                 |  14 +-
 bin/templates/cordova/lib/builders/AntBuilder.js   | 153 ---------
 .../cordova/lib/builders/GenericBuilder.js         |  38 +--
 .../cordova/lib/builders/GradleBuilder.js          |  53 +++-
 .../{GradleBuilder.js => StudioBuilder.js}         | 213 +++++++------
 bin/templates/cordova/lib/builders/builders.js     |   2 +-
 bin/templates/cordova/lib/device.js                |   2 +-
 bin/templates/cordova/lib/emulator.js              |   7 +-
 bin/templates/cordova/lib/pluginHandlers.js        |  28 +-
 bin/templates/cordova/lib/prepare.js               |   5 +-
 bin/templates/project/{ => app}/build.gradle       |  67 ++--
 bin/templates/project/build.gradle                 | 343 ++-------------------
 bin/templates/project/{ => legacy}/build.gradle    |  50 +--
 bin/templates/project/project.properties           |  20 +-
 framework/AndroidManifest.xml                      |   2 +-
 framework/build.gradle                             |   4 +-
 framework/cordova.gradle                           |   6 +-
 .../src/org/apache/cordova/CordovaActivity.java    |   1 +
 .../src/org/apache/cordova/CordovaBridge.java      |   5 +
 .../apache/cordova/CordovaClientCertRequest.java   |   9 +
 .../org/apache/cordova/CordovaInterfaceImpl.java   |   2 +
 .../src/org/apache/cordova/CordovaWebViewImpl.java |   2 +
 .../apache/cordova/engine/SystemWebViewEngine.java |   3 +
 package.json                                       |   2 +-
 spec/unit/create.spec.js                           |  17 +-
 spec/unit/pluginHandlers/handlers.spec.js          |  29 +-
 29 files changed, 424 insertions(+), 760 deletions(-)
 delete mode 100644 bin/templates/cordova/lib/builders/AntBuilder.js
 copy bin/templates/cordova/lib/builders/{GradleBuilder.js => StudioBuilder.js} (56%)
 copy bin/templates/project/{ => app}/build.gradle (85%)
 copy bin/templates/project/{ => legacy}/build.gradle (86%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cordova.apache.org" <co...@cordova.apache.org>'].

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[cordova-android] 01/01: Merge pull request #389 from infil00p/StudioProjectCompat

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bowserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git

commit 59018ab632e99b3e45a0bf9657c70282aeeac7bf
Merge: 3ad1ed7 c6cfeb1
Author: Joe Bowser <bo...@apache.org>
AuthorDate: Wed Nov 29 09:55:37 2017 -0800

    Merge pull request #389 from infil00p/StudioProjectCompat
    
    CB-11244: Studio Project Compatibility: Now with merge commit

 bin/lib/create.js                                  |  78 +++--
 bin/templates/cordova/Api.js                       |  25 +-
 bin/templates/cordova/lib/AndroidStudio.js         |   4 +-
 bin/templates/cordova/lib/build.js                 |  14 +-
 bin/templates/cordova/lib/builders/AntBuilder.js   | 153 ---------
 .../cordova/lib/builders/GenericBuilder.js         |  38 +--
 .../cordova/lib/builders/GradleBuilder.js          |  53 +++-
 .../{GradleBuilder.js => StudioBuilder.js}         | 213 +++++++------
 bin/templates/cordova/lib/builders/builders.js     |   2 +-
 bin/templates/cordova/lib/device.js                |   2 +-
 bin/templates/cordova/lib/emulator.js              |   7 +-
 bin/templates/cordova/lib/pluginHandlers.js        |  28 +-
 bin/templates/cordova/lib/prepare.js               |   5 +-
 bin/templates/project/{ => app}/build.gradle       |  67 ++--
 bin/templates/project/build.gradle                 | 343 ++-------------------
 bin/templates/project/{ => legacy}/build.gradle    |  50 +--
 bin/templates/project/project.properties           |  20 +-
 framework/AndroidManifest.xml                      |   2 +-
 framework/build.gradle                             |   4 +-
 framework/cordova.gradle                           |   6 +-
 .../src/org/apache/cordova/CordovaActivity.java    |   1 +
 .../src/org/apache/cordova/CordovaBridge.java      |   5 +
 .../apache/cordova/CordovaClientCertRequest.java   |   9 +
 .../org/apache/cordova/CordovaInterfaceImpl.java   |   2 +
 .../src/org/apache/cordova/CordovaWebViewImpl.java |   2 +
 .../apache/cordova/engine/SystemWebViewEngine.java |   3 +
 package.json                                       |   2 +-
 spec/unit/create.spec.js                           |  17 +-
 spec/unit/pluginHandlers/handlers.spec.js          |  29 +-
 29 files changed, 424 insertions(+), 760 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@cordova.apache.org" <co...@cordova.apache.org>.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org