github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,778 Commits 56 Branches 164 Tags
dd5a337a49cac4110b0c114ee5c65020c4a2ecf6
Commit Graph

2778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ian Clelland 51e634ccb4 Merge branch 'master' into 4.0.x (up to 3.7.0-dev) 
Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
	test/src/org/apache/cordova/test/basicauth.java
	test/src/org/apache/cordova/test/menus.java
 2014-09-11 10:16:46 -04:00
Ian Clelland 31b1a821ca Merge branch 'master' into 4.0.x (External whitelist changes) 2014-09-11 10:08:45 -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
Andrew Grieve 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
Ian Clelland 0e78dc35d8 CB-7512: Read android target from project.properties if possible 2014-09-10 11:39:29 -04:00
Ian Clelland c8bbdb23de CB-7512: Determine SDK and build tools version dynamcally at build time 2014-09-10 10:57:43 -04:00
Ian Clelland 7ee8117186 CB-7463: Adding licence to project template gradle file 2014-09-10 10:54:21 -04:00
Andrew Grieve 8237c41143 CB-7511 Auto-detect Android SDK when Android Studio is installed 2014-09-10 10:14:38 -04:00
Joe Bowser 8354651059 CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments 2014-09-04 10:49:43 -07:00
Joe Bowser 81cc3c260f CB-7463: Adding licences. I don't know what the gradle syntax is for comments, that still needs to be done. 2014-09-04 10:32:29 -07:00
Joe Bowser 4dc32e194b CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application 2014-09-03 15:42:39 -07:00
Steven Gill 5a82dd5110 updated releasenotes 2014-09-02 17:09:24 -07:00
Steven Gill f20708a5e7 Update JS snapshot to version 3.7.0-dev (via coho) 2014-08-29 16:34:17 -07:00
Steven Gill 91cf78f183 Set VERSION to 3.7.0-dev (via coho) 2014-08-29 16:34:12 -07:00
Marcel Kinard 0cde8819cf CB-7410 fix the menu test 
Need to show the title in order for the options menu button to be visible.
 2014-08-29 18:07:29 -04:00
Marcel Kinard 07632b0eeb CB-7410 Fix the errorUrl test 
Make the error.html page a well-formed html document, otherwise it
won't display.
 2014-08-29 17:38:03 -04:00
Marcel Kinard 4a7f825cfe CB-7410 Fix Basic Authentication test 
Looks like the Chromium webview does not include the port number on the
hostname during the callback challenge, but the classic webview does
include the port number. Handle both cases here.
 2014-08-29 16:41:51 -04:00
Ian Clelland 0b6b068097 CB-3445: Allow build and run scripts to select APK by architecture 2014-08-29 16:00:54 -04:00
Ian Clelland 4bc2051f44 CB-3445: Allow build and run scripts to select APK by architecture 2014-08-29 16:00:13 -04:00
Ian Clelland 623b2306ca CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture 2014-08-28 16:18:51 -04:00
Ian Clelland 34dde53506 CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture 2014-08-28 16:18:02 -04:00
Ian Clelland 7a09182446 CB-3445: Ensure that JAR files in libs directory are included 2014-08-28 13:17:26 -04:00
Ian Clelland 233e513860 CB-3445: Ensure that JAR files in libs directory are included 2014-08-28 11:26:58 -04:00
Marcel Kinard eb8cf56e8e CB-7267 update RELEASENOTES for 3.5.1 2014-08-28 09:42:53 -04:00
Marcel Kinard 12a27643db CB-7410 clarify the title 2014-08-27 13:56:31 -04:00
Marcel Kinard c6ccde0558 CB-7385 update cordova.js for testing prior to branch/tag 2014-08-27 09:04:32 -04:00
Marcel Kinard 16e3ebd87b CB-7410 add whitelist entries to get iframe/GoogleMaps working 2014-08-26 17:20:58 -04:00
Marcel Kinard 94c096dd5b CB-7291 propogate change in method signature to the native tests 2014-08-26 16:38:04 -04:00
Ian Clelland 2e3e4ec3b2 Merge branch 'CB-7291' 2014-08-26 15:25:41 -04:00
Ian Clelland 6e222c3938 CB-7291: Restrict meaning of "*" in internal whitelist to just http and https 2014-08-26 15:23:24 -04:00
Ian Clelland 3b3bd9b6c9 CB-7291: Only add file, content and data URLs to internal whitelist 2014-08-21 16:27:48 -04:00
Ian Clelland 4e3331ba66 CB-7291: Add defaults to external whitelist 2014-08-21 16:27:48 -04:00
Ian Clelland 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
Ian Clelland b2776269cf Merge branch 'master' into 4.0.x (Gradle library dependencies) 2014-08-20 11:43:58 -04:00
Ian Clelland b6c5a5fc9a CB-3445: Read project.properties to configure gradle libraries 2014-08-20 11:42:04 -04:00
Refael Ackermann 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
Andrew Grieve 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
Andrew Grieve 71e72f215d CB-7335 Add a .gitignore to android project template 2014-08-19 11:59:18 -04:00
Andrew Grieve 58cdfd86d0 CB-7330 Fix dangling function call in last commit (broke gradle builds) 2014-08-19 11:53:53 -04:00
Andrew Grieve 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
Andrew Grieve d56ea25816 CB-3445 Add gradle support clean command (plus some code cleanup) 
* Don't run ant clean for gradle ever
* Don't set sdk.dir since ANDROID_HOME is not always set
* Don't export builders
 2014-08-18 16:19:40 -04:00
Andrew Grieve c91b272648 CB-7044 Fix typo in prev commit causing check_reqs to always fail. 2014-08-18 15:26:52 -04:00
Andrew Grieve 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
Andrew Grieve 36eab713a1 CB-3445 Add .gradle template files for "update" as well as "create" 2014-08-18 14:50:27 -04:00
Andrew Grieve 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
Andrew Grieve effffcba1d CB-3445 Speed up gradle building (incremental builds go from 10s -> 1.5s for me) 
Biggest win is disabling the linter.
 2014-08-18 14:17:34 -04:00
Ian Clelland 404ce8bc3e Merge branch 'gradle-build-3.x' 
This introduces the gradle build system to Cordova-android, behind a flag currently
 2014-08-18 09:58:01 -04:00
Ian Clelland a91bd095b0 CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR 2014-08-18 09:48:31 -04:00
Ian Clelland fd6a1e5ed0 CB-3445: Add which to checked-in node_modules CheckIn_node_modules_which 2014-08-18 09:48:31 -04:00