f7f49d27c5
Merge branch 'master' into 4.0.x (gradle Android Studio)
2014-09-23 21:04:55 -04:00
0d313a3964
gradle: Write sub-project list explicitly to make Android Studio happy
2014-09-23 21:03:00 -04:00
8f27b2ab56
Merge branch 'master' into 4.0.x (gradle fixes)
2014-09-16 13:02:55 -04:00
090822eb41
CB-7536 check_reqs: windows tweaks + sdk manager error message
...
1. Don't escape \s since those are used by windows for directory seperators
2. Don't warn about missing directories on windows when we're just
testing for their existence
3. Don't give command to install sdk from command-line, since they also
require Build-tools and Platform-tools (which are not installed by
default with IDE-less SDK installer).
2014-09-16 11:13:15 -04:00
18fda7ec68
Merge branch 'master' into 4.0.x (more error message)
2014-09-12 16:18:12 -04:00
f2e8c00f49
CB-7536 Tweak Android SDK not installed error message.
...
We no longer require you to edit your PATH
2014-09-12 16:17:42 -04:00
30e8b818f5
Merge branch 'master' into 4.0.x (error messages)
2014-09-12 14:21:47 -04:00
525ce0e0ad
CB-7536 Tweak error messages for missing JDK / SDK / AVDs
2014-09-12 14:19:13 -04:00
3cd567dc95
Merge branch 'master' into 4.0.x (better auto-detect sdk)
2014-09-11 16:01:01 -04:00
2f7ffa3636
CB-7511 Auto-detect android sdk when using stand-alone sdk installer
2014-09-11 15:37:22 -04:00
d99386ef1e
Merge branch 'master' into 4.0.x
2014-09-11 15:12:31 -04:00
9ae3d2c074
CB-7512: Copy cordova.gradle file to project root on build
2014-09-11 15:12:07 -04:00
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
bf13fd48ce
Use add --compact flag in check_reqs when listing targets. No functional change.
2014-09-10 12:44:17 -04:00
3b99760a42
CB-7330 Don't run check_reqs for bin/create.
...
The create / update script doesn't require any dependencies, so we
shouldn't fail without them.
2014-09-10 12:44:17 -04:00
8237c41143
CB-7511 Auto-detect Android SDK when Android Studio is installed
2014-09-10 10:14:38 -04:00
7caa96abcd
Fix previous merges
...
Build scripts (create and build) were mangled somewhat by the previous
merge commits. This resets them to (almost) exactly the same state as
the 3.6.x (master) branch.
Conflicts:
bin/lib/create.js
2014-08-20 11:45:35 -04:00
b2776269cf
Merge branch 'master' into 4.0.x (Gradle library dependencies)
2014-08-20 11:43:58 -04:00
b6c5a5fc9a
CB-3445: Read project.properties to configure gradle libraries
2014-08-20 11:42:04 -04:00
94943a9a84
CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows
...
github: close #113
2014-08-20 11:20:02 -04:00
4c1942e3fe
Merge branch 'master' into 4.0.x (build & create script updates)
...
Conflicts:
bin/lib/check_reqs.js
bin/lib/create.js
bin/node_modules/which/package.json
bin/templates/cordova/lib/build.js
2014-08-19 12:02:36 -04:00
71e72f215d
CB-7335 Add a .gitignore to android project template
2014-08-19 11:59:18 -04:00
dfa66b9dd4
CB-7330 Don't run "android update" during creation
...
Instead, have the build script copy do the equivalent logic on each
build.
Advantages:
- Scripts run much faster
- No more duplicate CordovaLib entries in project.properties
- Building is more independent from create/update script (more robust)
2014-08-18 23:24:29 -04:00
c91b272648
CB-7044 Fix typo in prev commit causing check_reqs to always fail.
2014-08-18 15:26:52 -04:00
ca8bb75b40
CB-3445 Copy gradle wrapper in build instead of create
...
This should play nicer with updates to the android SDK.
2014-08-18 14:51:40 -04:00
36eab713a1
CB-3445 Add .gradle template files for "update" as well as "create"
2014-08-18 14:50:27 -04:00
7133576fe9
CB-7044 Add JAVA_HOME when not set. Be stricter about ANDROID_HOME
...
Also switches to using the which module over shelljs.which (better
support for .bat files)
2014-08-18 14:45:23 -04:00
a91bd095b0
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-08-18 09:48:31 -04:00
8aa813b862
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-08-18 09:48:31 -04:00
95aa5c9f1c
CB-7321 Don't require ant for create script
2014-08-15 13:58:53 -04:00
4319447cb5
CB-7044, CB-7299 Fix up PATH problems when possible.
...
Uses heuristics:
- Adds javac to PATH based on default install paths on Windows
- Adds javac to PATH based on JAVA_HOME
- Adds android and adb to PATH based on ANDROID_HOME
- Sets ANDROID_HOME based on location of "android"
2014-08-15 13:46:20 -04:00
e2b3f76a10
Merge branch 'master' into 4.0.x (PluginEntry refactor)
...
Conflicts:
framework/src/org/apache/cordova/PluginEntry.java
framework/src/org/apache/cordova/PluginManager.java
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
2014-07-14 14:18:10 -04:00
62101e85ff
Update to check for Google Glass APIs
...
This prevents the 'cordova build android' process from blowing up on this step if you assign the GDK as the target and want to rebuild via the CLI.
close #100
2014-07-14 10:30:23 -04:00
0a3714e5e0
Fix for android not being in PATH check on Windows
...
close #103
2014-07-14 10:28:27 -04:00
86a2830d75
Displaying error when regex does not match.
...
On my ubuntu when `android` is not found typical output is:
```
/bin/sh: 1: android: not found
```
close #104
2014-07-14 10:28:13 -04:00
4ce5123a12
Merge branch 'master' into 4.0.x (bindButton changes)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
package.json
2014-06-24 15:22:27 -04:00
4352456129
CB-5971: Fix package / project validation
2014-06-24 14:05:56 -04:00
bb141a70e8
CB-5971: Add unit tests to cordova-android
2014-06-24 14:05:56 -04:00
ff260c03ca
CB-5971: Factor out package/project name validation logic
2014-06-24 14:05:56 -04:00
96a1192474
Merge branch 'master' into 4.0.x (back button default behaviour fix)
...
Conflicts:
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-06-23 14:50:01 -04:00
0ffb5d253a
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-06-19 16:12:40 -04:00
fa189b3234
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-06-17 17:36:26 -04:00
141bbfb051
CB-5971: This would have been a good first bug, too bad
2014-06-12 17:51:22 -07:00
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
438a8d8b75
CB-4984 Don't create on CordovaActivity name
2014-01-28 14:25:26 -08:00
5b2a73e3eb
CB-5715 For CLI, hide assets/www and res/xml/config.xml by default
...
Add a helper file under assets to say how to re-show the hidden files.
Move the config.xml, www, merges entries to the root to be more discoverable.
2014-01-28 00:28:42 -05:00
cc94cc7d01
CB-5889 Make update script find project name instead of using "null" for CordovaLib
2014-01-24 10:40:40 -05:00
94934ae2cf
CB-5889 Add a message in the update script about needing to import CordovaLib when using an IDE.
2014-01-24 10:29:04 -05:00
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
5e0479e414
CB-5715 Add Eclipse .project file to create template.
...
Adds resource filter to hide CordovaLib/, platform_www/, and cordova/.
Adds linked resources to root www/, merges/, config.xml
2014-01-02 16:40:48 -05:00
Andrew Grieve