github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2024-10-07 02:02:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,472 Commits 53 Branches 159 Tags 74 MiB
1637937664
Commit Graph

510 Commits

Author SHA1 Message Date
Joe Bowser
db4d1f5768 CB-11383: Update to gradle for using jcenter and correct Application plugin 2016-06-06 11:21:30 -07:00
Steve Gill
81d6219663 CB-11365 fixed plugin rm issue with emit being undefined 2016-06-02 11:32:21 -07:00
Jason Ginchereau
3a1b4ffcb8 Use platform config.xml for clean 
This closes #295
 2016-05-31 10:27:40 -07:00
Jason Ginchereau
72bbe9fdf0 CB-11117: Use FileUpdater to optimize prepare for android platform 2016-05-31 10:27:37 -07:00
Richard Knoll
9738079c42 CB-11259: Improving build output 
This closes #305
 2016-05-17 13:31:12 -07:00
Joe Bowser
e9e27ca47c CB-10096: Upgrading to Gradle Plugin 2.1.0 2016-05-09 10:59:36 -07:00
Nikhil Khandelwal
5d21fb26e6 CB-11198 Skip android target sdk check. This closes #303. 2016-05-06 10:44:14 -07:00
Vladimir Kotikov
d351e316bf CB-11138 Reuse PluginManager from common to add/rm plugins 
This closes #301
 2016-04-29 15:07:05 +03:00
daserge
914e2fa35f CB-11163 Android Builds are failing in CI 
CB-11133 Handle android emulator start failure (reverted from commit abcaee24f9)
 2016-04-28 17:25:39 +03:00
Nikhil Khandelwal
8b96081579 CB-11153 Move to gradle version 2.13 
This closes #299
 2016-04-26 14:56:02 -07:00
Nikhil Khandelwal
f3e0623d1d CB-11153 Use Gradle 2.8 correctly for building Android projects 2016-04-26 14:55:55 -07:00
daserge
abcaee24f9 CB-11133 Handle android emulator start failure 2016-04-26 19:54:34 +03:00
daserge
8951660393 CB-11132 Fix Error: Cannot read property 'match' of undefined in cordova-android emulator.js 2016-04-21 15:40:33 +03:00
Nikhil Khandelwal
e4ecbad3cb Add simple log for package name being deployed 2016-04-20 09:36:02 -07:00
daserge
40a740b45c CB-11015 Error adding plugin with gradle extras 2016-04-18 13:20:25 +03:00
Vladimir Kotikov
9af7f506f0 CB-11095 Fix plugin add/removal when running on Node v.010 2016-04-18 12:26:39 +03:00
Vladimir Kotikov
9b8558dbde CB-11022 Duplicate www files to both destinations on plugin operations 
This closes #289
 2016-04-14 12:03:44 +03:00
daserge
d28ca67edb CB-10964 Handle build.json file starting with a BOM. This closes #286 2016-04-08 15:32:04 -07:00
daserge
d9814c5542 CB-8582 Obscure INSTALL_FAILED_VERSION_DOWNGRADE error when installing app 2016-03-28 13:22:22 +03:00
daserge
dd3b9dd01c CB-10862 Cannot set minsdkversion 2016-03-28 11:35:40 +03:00
Vladimir Kotikov
69a2a5b551 CB-10837 Support platform-specific orientation on Android 
Remove processing of "orientation" preference and let
user to specify any platform-specific value for Android

 This closes #281
 2016-03-21 18:30:20 +03:00
daserge
bc9e895e25 CB-10600 'cordova run android --release' does not use signed and zip-aligned version of APK 
De-prioritize unsigned builds
Adds an actionable hint for INSTALL_PARSE_FAILED_NO_CERTIFICATES error
Removes filtering by architecture when not specified
 2016-03-18 08:59:59 +03:00
Roberto Andrade
457c5b8b3b CB-9710: Fixing issues parsing android avd list output for certain AVDs which resulted in them not being included in the selection process even if they are the best match. 
This closes 221
 2016-03-16 09:32:24 -07:00
Julien Bouquillon
2cefb42559 fix issue with app_name containing apostrophes 2016-03-14 14:01:43 +01:00
daserge
82582e5a5b CB-10749 Use cordova-common.CordovaLogger in cordova-android 
Added -d shorthand to all platform scripts
 2016-03-09 18:54:05 +03:00
Byoungro So
18e81c4b90 CB-10673 fixed conflicting plugin install issue with overlapped <source-file> tag. Add --force flag. This closes #264. 2016-03-07 23:02:19 -08:00
Joe Bowser
bad0034e5d CB-8976: I wish there was an easier way to test gradle stuff then check it in without having to remember to delete imports 
This closes #270
 2016-03-04 09:53:01 -08:00
Joe Bowser
99d5ff7347 CB-8976: Accidentally left in the crosswalk build from when I was experimenting with this file 2016-03-04 09:53:00 -08:00
Joe Bowser
dc579417fe CB-8976: Removing the auto-version for non-Crosswalk applications 2016-03-04 09:53:00 -08:00
daserge
fe906dabda CB-10768 Use cordova-common.superspawn in GradleBuilder 2016-03-03 21:12:28 +03:00
Vladimir Kotikov
8ab75e7109 CB-10729 Move plugin handlers tests for into platform's repo 2016-03-01 11:31:14 +03:00
daserge
aa2b3d3da1 CB-10669 cordova run --list cannot find 'adb' 2016-02-26 13:29:26 +03:00
Byoungro So
0a1b71f125 CB-10660 fixed the exception when removing a non-existing directory. This closes #261 2016-02-26 10:40:33 +03:00
Steve Gill
757a3685f2 Update JS snapshot to version 5.2.0-dev (via coho) 2016-02-24 11:50:08 -08:00
daserge
ce2525d4d8 CB-10628 Fix emulate android --target 
Added a test case
 2016-02-18 21:27:40 +03:00
Vladimir Kotikov
7be9e880c2 CB-10618 Handle gradle frameworks on plugin installation/uninstallation 
This closes #259
 2016-02-17 17:56:09 +03:00
riknoll
7233931681 CB-10510: Add an optional timeout to emu start script 
The script used to wait forever for the emulator to boot.
If the emulator got stuck, it would never terminate.
This timeout is being added to support cordova-medic and
the CI.
 2016-02-11 13:37:00 -08:00
riknoll
d7e111fb71 CB-10498: Resume event should be sticky if it has a plugin result 2016-02-03 13:25:56 -08:00
Vladimir Kotikov
e08d0671ab CB-10138 Adds missing plugin metadata to plugin_list module. This closes #254 2016-01-28 12:45:19 +03:00
Dimitar Kerezov
7669378c6e CB-10443 Pass original options instead of remaining 
Nopt parses all options regardless of what is passed as "knownOpts". This leaves the remain property an emtpy array.
This ultimately leads to a bug in the parseOpts function where the options undergo a second parsing from nopt.
The end result is - this options are not respected at all..
This closes #248
 2016-01-28 11:55:29 +03:00
Dimitar Kerezov
1494082a2a CB-10443 Fix this.root null reference 
parseOpts function referenced this.root but the this object is not the new Api as expected. This leads to an exception upon calling path.relative(this.root, ...).
 2016-01-28 11:55:15 +03:00
Vladimir Kotikov
233c2bd882 CB-10421 Fixes exception when calling run script with --help option 2016-01-26 14:56:29 +03:00
Vladimir Kotikov
89d982a8e4 CB-10406 Fixes an exception, thrown when building using Ant. This closes #250 2016-01-22 13:29:50 +03:00
Vladimir Kotikov
9d3ee3d56e CB-10157 Uninstall app from device/emulator only when signed apk is already installed 2016-01-22 12:36:48 +03:00
Steve Gill
320558a782 Update JS snapshot to version 5.2.0-dev (via coho) 2016-01-20 16:18:53 -08:00
Steve Gill
9ef7ddbf20 Set VERSION to 5.2.0-dev (via coho) 2016-01-20 16:18:52 -08:00
Nikhil Khandelwal
ada35e0e00 Fix jshint issues 2016-01-19 12:01:44 -08:00
Nikhil Khandelwal
fc778006ef CB-10386 Add android.useDeprecatedNdk=true to support NDK in gradle 2016-01-19 11:36:39 -08:00
Joe Bowser
11760afddd CB-8864: Fixing this to mitigate CB-8685 and CB-10104 2016-01-12 10:39:55 -08:00
Joe Bowser
d78ae309f1 CB-10105: Spot fix for tilde errors on paths. 2016-01-11 15:53:00 -08:00
Darryl Pogue
73fd9e4dfa Update theme to Theme.DeviceDefault.NoActionBar 
This uses the device system theme instead of the old Gingerbread-era theme for dialogs and alerts.

Available as of API 14, which is now the minSDK version for cordova-android.

This closes 245
 2016-01-04 12:31:56 -08:00
Darryl Pogue
fb9cf60c41 CB-10014: Set gradle applicationId to package name. 
This closes 247
 2016-01-04 12:18:55 -08:00
Joe Bowser
70bc7b39b7 CB-9479: Fixing the conditionals again, we should be more vigilant on the gradle versions. 2015-12-07 15:03:02 -08:00
Vladimir Kotikov
03777067cd CB-10112 Parse additional CLI arguments properly. This closes #241 2015-12-03 13:54:59 +03:00
Vladimir Kotikov
c30eeee5d8 CB-9971 Suppress gradlew _JAVA_OPTIONS output during build 2015-11-20 11:57:18 +03:00
Steve Gill
6afc16c33b Update JS snapshot to version 5.1.0-dev (via coho) 2015-11-01 23:43:03 -08:00
Steve Gill
74a3d2028f Set VERSION to 5.1.0-dev (via coho) 2015-11-01 23:43:00 -08:00
Steve Gill
671219ae56 CB-9870 updated hello world template 2015-10-29 15:33:43 -07:00
Vladimir Kotikov
c1b389ad9b CB-9844 Remove old .java after renaming activity 2015-10-27 11:30:58 +03:00
Vladimir Kotikov
78b7ae72c9 Adds licence header to Adb to pass rat audit 2015-10-22 14:06:20 +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
fujunwei
0429bb0ab8 The extra digit need to be added to the end of the version code 
The version code of default config is generated by the environment variable
and the value from AndroidManifest.xml.
The test case is using the command line "cordova build -- --versionCode=100".. This closes #211
 2015-10-19 11:25:33 -07:00
Joe Bowser
2ceb8030ee Manually updating version to 5.0.0-dev for engine tags 2015-10-19 10:31:55 -07:00
daserge
7d61a79a78 CB-9608 cordova-android no longer builds on Node 0.10 or below 
Replaced path.isAbsolute usage with path.resolve. This closes #217
 2015-09-29 09:45:48 +03:00
daserge
afa61aeb09 CB-9080 Cordova CLI run for Android versions 4.1.1 and lower throws error 2015-09-23 18:44:41 +03:00
Vladimir Kotikov
bf57aa1df0 CB-9557 Fixes apk install failure when switching from debug to release build 2015-08-27 09:46:58 +03:00
Tommy-Carlos Williams
055e3bf609 CB-9496 removed permissions added for crosswalk 
These would better live in the actual crosswalk plugin

https://github.com/crosswalk-project/cordova-plugin-crosswalk-webview

I have also submit a PR to that repo adding them to its `plugin.xml`

github: close #206
 2015-08-24 23:17:03 +10:00
Alexander Lebedev
b1dadaf15d CB-9402 Allow to set gradle distubutionUrl via env variable CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL 
This closes #205
 2015-08-14 11:28:35 -07:00
alsorokin
64f89c5eda CB-9172 Improved emulator deploy stability. This closes #188. 
- Use UUID to distinguish between launched emulators
- Wait for android.process.acore instead of init.svc.bootanim on emulator boot
- Increased retry timeout when installing app to the emulator
- If there is already a started/starting emulator, wait for it's boot instead of trying to deploy to it right away
 2015-07-31 03:59:53 -07:00
alsorokin
1ad0665eb5 CB-9404 Fixed an exception when path contained -debug or -release 2015-07-23 18:55:11 +03:00
alsorokin
8983ddbdcc CB-9185 Fixed an issue when unsigned apks couldn't be found. This closes #202 2015-07-22 11:00:07 -07:00
Nikhil Khandelwal
847312fcf9 Update JS snapshot to version 4.2.0-dev (via coho) 2015-07-20 09:52:18 -07:00
Nikhil Khandelwal
b770076b7f Set VERSION to 4.2.0-dev (via coho) 2015-07-20 09:52:14 -07:00
Jose Pereira
4b3cc67353 CB-9392 Fixed printing flavored versions. This closes #184 2015-07-20 16:52:28 +03:00
Malte Legenhausen
2fc86e2833 CB-9391 Fixes cdvBuildMultipleApks option casting 
This closes #199
 2015-07-20 15:59:27 +03:00
Vladimir Kotikov
26c7a96255 CB-9149 Fixes JSHint issue introduced by 899daa9 2015-07-20 13:00:17 +03:00
Omar Mefire
e170e463fe CB-9372: Remove unused files: 'main.js' & 'master.css'. This closes #198 2015-07-20 12:42:38 +03:00
Tony Homer
899daa9ea7 CB-9149 Make gradle alias subprojects in order to handle libs that depend on libs. This closes #182 2015-07-17 16:10:16 -04:00
Joe Schneider
f93c2b161d CB-9185 Fix signed release build exception. This closes #193. 2015-07-07 11:35:53 -07:00
Nikhil Khandelwal
d3245a43d3 CB-9284 Fix for handling absolute path for keystore in build.json 2015-07-02 15:13:31 -07:00
Dmitry Blotsky
c0312f9b50 CB-9119 Adding lib/retry.js for retrying promise-returning functions. Retrying 'adb install' in emulator.js because it sometimes hangs. 2015-06-12 11:50:15 -07:00
Nikhil Khandelwal
505db38232 Remove extra console message 2015-06-05 10:21:53 -07:00
Joe Bowser
c9e7201058 CB-9080: -d option is not supported on Android 4.1.1 and lower, removing 2015-06-02 07:43:33 -07:00
Steve Gill
ce42568721 Update JS snapshot to version 4.1.0-dev (via coho) 2015-05-20 13:12:35 -07:00
Steve Gill
215b7e08f8 Update JS snapshot to version 4.1.0-dev (via coho) 2015-05-08 15:33:05 -07:00
Andrew Grieve
85877d259c Don't show warning when gradlew file is read-only 2015-04-23 15:38:48 -04:00
Andrew Grieve
0b86db8748 Don't show warning when prepEnv copies gradlew and it's read-only 2015-04-23 15:34:25 -04:00
Andrew Grieve
bca7f62efd Make gradle wrapper prepEnv code work even when android-sdk is read-only 2015-04-23 15:18:01 -04:00
Andrew Grieve
4953ae84cd CB-8897 Delete drawable/icon.png since it duplicates drawable-mdpi/icon.png 2015-04-22 21:59:02 -04:00
Joe Bowser
e4678f4709 CB-8894: Updating the template to target mininumSdkTarget=14 2015-04-22 14:18:41 -07:00
Andrew Grieve
ee14a67795 CB-8884 Delete Eclipse tweaks from create script 2015-04-21 14:24:15 -04:00
Andrew Grieve
b63a2e37be CB-8834 Don't fail to install on VERSION_DOWNGRADE 2015-04-09 11:28:55 -04:00
Andrew Grieve
84274b4259 Update JS snapshot to version 4.1.0-dev (via coho) 2015-04-09 11:05:48 -04:00
Andrew Grieve
b6bf5298e6 Set VERSION to 4.1.0-dev (via coho) 2015-04-09 11:05:47 -04:00
Andrew Grieve
b27d283f21 CB-8548 Fix keystore type detection (broken by 97718a0a25) 2015-04-07 20:36:13 -04:00
Nikhil Khandelwal
ad1c3d2438 CB-8484 Add signing flags to build and run scripts 
Parameters for creating signed archives can be specified using command line or build.json file as part of the --buildConfig argument.
close #164
 2015-04-01 19:53:56 -04:00
Andrew Grieve
51adf81918 CB-8781 Add building of .so files within libs/ to gradle rules 2015-04-01 13:33:48 -04:00
Andrew Grieve
97718a0a25 CB-8548 Allow ant-style property key for key.store.type 
Other properties already allowed ant-style. This one was missed.
 2015-03-31 20:42:26 -04: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
Andrew Grieve
e1828696f7 CB-8295 Update app template with fix to CSP string 2015-03-11 21:14:39 -04:00
Andrew Grieve
191839f764 Tweak CSP of default template 2015-03-06 09:54:48 -05:00
Andrew Grieve
316cf057f3 Update project template with new whitelist defaults 2015-03-05 22:31:48 -05:00
Andrew Grieve
beab74adf5 CB-8548 Allow ant-style property keys in signing.properties files 
Provides easier backwards compatibility
close #155
 2015-02-25 15:41:58 -05:00
Nikhil Khandelwal
2a49e8a931 CB-8520 Fix for extra args being added twice for build command (close #159) 2015-02-25 14:28:06 -05:00
Andrew Grieve
1b4f5b13f1 CB-8548 Use debug-signing.properties and release-signing.properties when they exist 2015-02-25 14:16:29 -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
ce351f5c38 CB-8390 Add Gradle support for Play Services and Support libraries 2015-02-02 23:26:53 -05:00
Andrew Grieve
bf327f3916 Allow cdvMinSdkVersion and cdvVersionCode to be set to ints (instead of just strings) 2015-01-30 11:42:56 -05:00
Andrew Grieve
7e7dc7694c CB-8373 Add gradle plugin includes based on project.properties (where plugman now puts them) 2015-01-28 16:27:05 -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
98f90340f3 Make plugin .gradle extensions run at the same point as build-extras.gradle 
This lets them change cdv* property defaults, and allows modifying
values at the end as well.
 2015-01-26 16:26:57 -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
a3457d9408 CB-8026 Remove default target value from gradle file 
Wasn't being used anyways, and it still referenced android-19
This also switches to using a Properties object rather than a RegEx
for parsing project.properties
 2015-01-20 11:33:55 -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
e671ffdab1 Merge branch 'master' into 4.0.x (gradle fixes) 2015-01-19 22:04:10 -05:00
Andrew Grieve
92d1080b2f Adds cdvPrintProps gradle task: dumps out all cdv properties 
Useful for debugging.
 2015-01-19 21:59:02 -05:00
Andrew Grieve
893c0e9b67 CB-8255 Pass arch to gradle regardless of cdvBuildMultipleApks 
This also pushes the "which target to build" logic into gradle, since
build.js doesn't actually know the value of `cdvBuildMultipleApks`.
 2015-01-19 21:56:46 -05:00
Andrew Grieve
af60f71ea3 CB-8255 Fix cordova/build --gradleVar=--foo=bar stripping off =bar 2015-01-19 21:54:29 -05:00
Andrew Grieve
9a952f1004 Fix cordova/build not printing out all gradle args in console message 2015-01-19 21:53:08 -05:00
Andrew Grieve
3ec7dfff8b Fix cordova/run not finding apk when multi-arch is specified but only arch-independent apk exists 2015-01-19 21:51:57 -05:00
Andrew Grieve
d30a5e0388 Fix exception for unknown flag in cordova/run 2015-01-19 21:50:14 -05:00
Andrew Grieve
fcece7e189 Allow --ant, --gradle for cordova/run 2015-01-19 21:49:36 -05:00
Andrew Grieve
4382234676 Merge branch 'master' into 4.0.x (fix windows space-in-path bug) 
close #147
Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/assets/www/cordova.js
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
 2015-01-13 10:01:31 -05:00
Murat Sutunc
8e5c93a31f CB-4914 Fix build whitespace issue 2015-01-13 09:59:29 -05:00
Joe Bowser
4b8069f5ec Set VERSION to 3.8.0-dev (via coho) 2015-01-12 14:55:48 -08:00
Andrew Grieve
2083f683ad Merge branch 'master' into 4.0.x (gradle properties) 
Conflicts:
	bin/templates/cordova/lib/build.js
 2015-01-08 15:43:22 -05:00
Andrew Grieve
c3610aa43c CB-8255 Use properties rather than environment variables for gradle settings 2015-01-08 15:26:24 -05:00
Andrew Grieve
95e10bdb9e Merge branch 'master' into 4.0.x (run --list) 2015-01-03 21:06:07 -05:00
Murat Sutunc
c2a6dcb6bd CB-8168 Add support for cordova/run --list (closes #139) 2015-01-03 21:05:52 -05:00
Andrew Grieve
5a17d6cd5f Merge branch 'master' into 4.0.x (gradle - maven and CordovaLib dep) 2014-12-30 22:59:50 -05:00
Andrew Grieve
480af2644c CB-8228 Gradle: Allow plugins to use Maven dependencies 2014-12-30 22:57:53 -05:00
Andrew Grieve
ecd2e06883 CB-8229 Gradle: Add CordovaLib as a dependency to all plugin sub-projects 2014-12-30 22:56:43 -05:00
Andrew Grieve
4f3ae23170 Merge branch 'master' into 4.0.x (--minSdkVersion and --versionCode) 
Conflicts:
	bin/templates/project/build.gradle
 2014-12-24 13:35:39 -05:00
Andrew Grieve
7cfb33d0ef CB-7980 Add --minSdkVersion and --versionCode flags to cordova/build command 
These are also exposed via environment variables: ANDROID_VERSION_CODE, ANDROID_MIN_SDK_VERSION
This also fixes build.gradle modifying the value set by ANDROID_VERSION_CODE when multi-apk is enabled (override should never be modified)
 2014-12-23 16:26:43 -05:00
Mark Koudritsky
9224ab1592 CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch 2014-12-23 15:29:40 -05:00
Ian Clelland
a696ff37f1 Merge branch 'master' into 4.0.x (Plugin set multiarach) 2014-12-22 23:19:56 -05:00
fujunwei
931a996dab Allow plugins to set ext.multiarch to enable multiple APK building 
The xwalk webView need build multiple apks by default after install
cordova-crosswalk-engine plugin, we can set ext.multiarch=true to open
the flag in plugin, it don't necessary set system environment BUILD_MULTIPLE_APKS
manually.

This closes #141
 2014-12-22 23:19:27 -05:00
Ian Clelland
68c03090a3 Merge branch 'master' into 4.0.x (Gradle lint stages) 2014-12-22 13:29:50 -05:00
Ian Clelland
98fe46757f CB-8204: Reinstate link tasks to avoid gradle build failures 2014-12-22 13:24:58 -05:00
Andrew Grieve
cefd137634 Merge branch 'master' into 4.0.x (gradle version bump) 2014-12-22 11:45:02 -05:00
Andrew Grieve
6b6e887c2f CB-8143 Use gradle 2.2.1 instead of 1.12 to appease Android Studio 1.0 warning-on-startup 2014-12-22 11:37:06 -05:00
Andrew Grieve
20cd4f806a Merge branch 'master' into 4.0.x (gradle version for Android Studio) 2014-12-22 11:25:59 -05:00
Andrew Grieve
b92303b1c9 CB-8143 Use gradle plugin 1.0.0 for Android Studio 1.0.0 2014-12-22 11:19:21 -05:00
Andrew Grieve
59d23e05b1 Merge branch 'master' into 4.0.x (apk signing with interactive passwords) 2014-12-22 10:22:41 -05:00
Andrew Grieve
731a36d3a0 CB-8202 Fix gradle build signing when passwords provided interactively 2014-12-22 10:21:17 -05:00
Andrew Grieve
f086ef5cad Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag) 
Conflicts:
	framework/src/org/apache/cordova/SplashScreenInternal.java
 2014-12-11 13:47:07 -05:00
Andrew Grieve
d80d532a2a Fix syntax error in 3aca14d530 2014-12-10 21:16:54 -05:00