Commit Graph

115 Commits

Author SHA1 Message Date
Tim Barham 1c90a77325 CB-9909 Shouldn't escape spaces in paths on Windows.. This closes #237 2015-10-30 04:58:26 -07:00
Vladimir Kotikov 78fa7374d9 CB-9880 Fixes platform update failure when upgrading from android@<4.1.0 2015-10-28 12:42:35 +03:00
Steve Gill 0ac822c577 Fixed line endings 2015-10-20 16:15:57 -07:00
Vladimir Kotikov 400282282f CB-9782 Implements PlatformApi contract for Android platform.
This closes #226
2015-10-20 12:21:30 +03:00
Steve Gill 8f7bc1ffbb CB-9428 update script now bumps up minSdkVersion to 14 if it is less than that. 2015-07-31 16:32:51 -07:00
Vladimir Kotikov e5506d40bc CB-9430 Fixes check_reqs failure when javac returns an extra line 2015-07-31 16:37:21 +03:00
Vladimir Kotikov d99a21eb8d CB-9397 Fixes minor issues with cordova requirements android 2015-07-22 16:45:49 +03:00
Vladimir Kotikov f9ce1c607b CB-9389 Fixes build/check_reqs hang
This removes gradle version check since it requires downloading and
installing of gradle distributive if it is not installed yet.

Partial revert of 4bf705a
2015-07-22 13:20:39 +03:00
Vladimir Kotikov 6b071c0fb2 CB-9286 Fixes build failure when ANDROID_HOME is not set. 2015-07-03 09:46:39 +03:00
Vladimir Kotikov 096e1e3caa CB-8898 Report expected gradle location properly 2015-06-03 21:57:50 +03:00
Vladimir Kotikov b5d8b51310 CB-8898 Fixes gradle check failure due to missing quotes 2015-06-03 12:37:25 +03:00
Vladimir Kotikov 4bf705a3d3 CB-8954 Adds requirements command support to check_reqs module 2015-05-29 13:00:38 +03:00
Andrew Grieve ee14a67795 CB-8884 Delete Eclipse tweaks from create script 2015-04-21 14:24:15 -04:00
Andrew Grieve b0d5ffec8f Delete unused packate "which" from package.json 2015-04-09 11:03:36 -04:00
Joe Bowser 151b86cb7b CB-8735: Adding link as per Ian's suggestion 2015-03-23 15:54:05 -07:00
Joe Bowser e4c9bebe34 CB-8735: Fixing the regex so that it's more compliant with Java package rules 2015-03-23 15:23:30 -07:00
Andrew Grieve 2103da7b9d CB-8693 Delete framework/res and framework/assets
They were being merged into apps unwantingly.
2015-03-17 11:56:02 -04:00
Connor Pearson dcff8794ad CB-7827 Add --activity-name for bin/create
Also adds in nopt
2015-02-25 14:23:26 -05:00
Murat Sutunc dbd45d4173 fix jshint errors (close #157) 2015-02-18 21:31:43 -05:00
Andrew Grieve db18e1480e CB-8469 Create gradle build files as part of create script
Makes project imporatable by Android Studio before first build
2015-02-12 16:15:43 -05:00
Murat Sutunc aed4859642 CB-8410 Fix all jshint issues for Android platform (close #153) 2015-02-03 15:21:57 -05:00
Andrew Grieve 3b909253bb Merge branch 'master' into 4.0.x (gradle plugin extension) 2015-01-26 16:28:31 -05:00
Andrew Grieve a4c9bf7d30 CB-8358 Make --link an alias for --shared for create/update. Make it work with gradle 2015-01-26 10:07:14 -05:00
Andrew Grieve c352b296da Merge branch 'master' into 4.0.x (gradlify tests)
Conflicts:
	test/androidTest/src/org/apache/cordova/test/junit/MenuTest.java
2015-01-20 14:55:44 -05:00
Andrew Grieve a56c406aa3 Made check_reqs script echo ANDROID_HOME and JAVA_HOME when run directly 2015-01-20 14:14:39 -05:00
Andrew Grieve b69fed18e2 Move cordova.gradle from project template to CordovaLib
Make it easier to share with tests project.
Also, one less file in the project template is a good thing.
2015-01-20 11:04:40 -05:00
Andrew Grieve 162fc0720e Merge branch 'master' into 4.0.x (SDK search path) 2014-12-16 14:18:58 -05:00
Andrew Grieve 342bbaa3ae CB-8176 Update Android SDK search path for Android Studio 1.0 2014-12-16 14:17:55 -05:00
Andrew Grieve 7ad16e5b0c Merge branch 'master' into 4.0.x (Hardcode activity name) 2014-10-07 15:25:56 -04:00
Vladimir Kotikov 9f41906895 CB-6511 Fixes build for android when app name contains unicode characters.
github: close #124
2014-10-07 15:24:12 -04:00
Andrew Grieve 9577735ff7 Merge branch 'master' into 4.0.x (check_reqs for brew) 2014-10-06 10:34:19 -04:00
Andrew Grieve 2dcd50c11b CB-7714 Teach check_reqs about brew's install location for android SDK 2014-10-06 10:33:31 -04:00
Andrew Grieve 862c223e11 Merge branch 'master' into 4.0.x (.gitignore, create --shared) 2014-10-04 15:30:30 -04:00
Andrew Grieve 30681eb772 Fix --shared flag of create script (broke in recent gradle changes) 2014-10-04 15:14:51 -04:00
Andrew Grieve e5efc91ef4 Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu) 2014-09-29 10:16:33 -04:00
Andrew Grieve e31c911c30 CB-7634 Detect JAVA_HOME properly on Ubuntu 2014-09-29 10:16:22 -04:00
Andrew Grieve f7f49d27c5 Merge branch 'master' into 4.0.x (gradle Android Studio) 2014-09-23 21:04:55 -04:00
Andrew Grieve 0d313a3964 gradle: Write sub-project list explicitly to make Android Studio happy 2014-09-23 21:03:00 -04:00
Andrew Grieve 8f27b2ab56 Merge branch 'master' into 4.0.x (gradle fixes) 2014-09-16 13:02:55 -04:00
Andrew Grieve 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
Andrew Grieve 18fda7ec68 Merge branch 'master' into 4.0.x (more error message) 2014-09-12 16:18:12 -04:00
Andrew Grieve 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
Andrew Grieve 30e8b818f5 Merge branch 'master' into 4.0.x (error messages) 2014-09-12 14:21:47 -04:00
Andrew Grieve 525ce0e0ad CB-7536 Tweak error messages for missing JDK / SDK / AVDs 2014-09-12 14:19:13 -04:00
Andrew Grieve 3cd567dc95 Merge branch 'master' into 4.0.x (better auto-detect sdk) 2014-09-11 16:01:01 -04:00
Andrew Grieve 2f7ffa3636 CB-7511 Auto-detect android sdk when using stand-alone sdk installer 2014-09-11 15:37:22 -04:00
Ian Clelland d99386ef1e Merge branch 'master' into 4.0.x 2014-09-11 15:12:31 -04:00
Ian Clelland 9ae3d2c074 CB-7512: Copy cordova.gradle file to project root on build 2014-09-11 15:12:07 -04:00
Ian Clelland dd5a337a49 Merge branch 'master' into 4.0.x
Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
Andrew Grieve bf13fd48ce Use add --compact flag in check_reqs when listing targets. No functional change. 2014-09-10 12:44:17 -04:00