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
Andrew Grieve
3aca14d530
CB-8147 Have corodva/build warn about unrecognized flags rather than fail
...
Close #127
2014-12-10 21:02:57 -05:00
sgrebnov
268fea58ee
CB-7881 Android tooling shouldn't lock application directory
...
Close #130
2014-12-10 21:02:48 -05:00
Andrew Grieve
87cdc5ad1c
Merge branch 'master' into 4.0.x (SplashScreen breakout)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-12-10 16:09:22 -05:00
fujunwei
ba140a8a84
Add a section for plugin extensions
...
The build.gradle will apply gradle srcipte from plugin extension
When install the plugin with "gradleReference" framework.
The gradle can set ext.multiarch=true to support multiple APKs by
default, so add this section in here.
2014-12-10 15:44:39 -05:00
Ian Clelland
f953e6adb8
CB-8143: Use the correct Android Gradle plugin for the installed Gradle version
2014-12-10 10:07:05 -05:00
Brian Geppert
ffd14fe7d9
Revert Gradle distributionUrlRegex cleanup.
...
This reverts commit 75a0a6752a
2014-12-09 14:23:38 -05:00
Ian Clelland
3206c2100d
Merge branch 'plugin-gradle' into 4.0.x
2014-12-09 09:43:37 -05:00
Andrew Grieve
66fa12a091
CB-8119 Restart adb when we detect it's hung
2014-12-04 10:00:26 -05:00
Andrew Grieve
b1bdf23d9c
Switch default build type to gradle (4.0.x only)
2014-12-03 10:12:31 -05:00
Andrew Grieve
e597f98c62
Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)
2014-11-26 11:48:08 -05:00
Andrew Grieve
7fbb2b195f
CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
2014-11-26 11:44:49 -05:00
fujunwei
9b82ae19b0
Add a section for plugin extensions
...
The build.gradle will apply gradle srcipte from plugin extension
When install the plugin with "gradleReference" framework.
The gradle can set ext.multiarch=true to support multiple APKs by
default, so add this section in here.
2014-11-17 15:52:40 +08:00
Mark Koudritsky
9d3c13065b
CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
2014-11-06 18:27:36 -05:00
Andrew Grieve
fdef0db87c
Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-11-06 15:37:30 -05:00
Chris Alfano
832e626573
CB-7726 fix typo in gitignore: ant-built -> ant-build
...
github: close #131
2014-10-27 12:33:09 -04:00
Andrew Grieve
cc7d352209
Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)
2014-10-21 13:00:07 -04:00
Andrew Grieve
ce5d9a2ee8
gradle: Allow storeType to be set (allows using .p12 files)
2014-10-21 12:59:34 -04:00
Andrew Grieve
77c51d3ae7
gradle: Allow absolute paths to keystore files
2014-10-21 12:43:30 -04:00
Marcel Kinard
c255a84941
CB-7674 move preference activation back into onCreate()
...
The preference creation actually needs to be before
super.onCreate(savedInstance) in order to avoid the exception
"requestFeature() must be called before adding content". Also ran into an
issue in the native tests "Whitelist" and "User WebView/Client/Chrome" where
it would throw an exception that the CordovaWebView appView already had
a parent and needed to be removed from that parent before the invocation
to root.addView(appView). So I conditionally remove the wrong parent.
Also made a change to the native tests so the menus test would work.
I also put super.init() back into the template, though invoking it is optional
as loadUrl will call it automatically if needed.
2014-09-30 19:38:34 -04:00
Andrew Grieve
6d5b88d7b9
Merge branch 'master' into 4.0.x (per-arch gradle builds)
2014-09-24 16:18:51 -04:00
Max Woghiren
a986e72338
Added gradle distribution URL updating. (commit fix-up)
2014-09-24 16:18:18 -04:00
Andrew Grieve
162d9b6c2e
gradle: Build only the active architecture when applicable
2014-09-24 16:16:59 -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
9e3ccf4b3e
gradle: Fix warning about dynamic properties being deprecated
2014-09-23 21:04:04 -04:00
Andrew Grieve
6b71c2f392
gradle: Have project's build.gradle look for a build-extras.gradle
2014-09-23 21:03:17 -04:00
Andrew Grieve
0d313a3964
gradle: Write sub-project list explicitly to make Android Studio happy
2014-09-23 21:03:00 -04:00
Max Woghiren
75a0a6752a
Improved a regex.
2014-09-23 14:27:54 -04:00
Andrew Grieve
363fc8deb5
Merge branch 'master' into 4.0.x (gradle plugin template)
...
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
2014-09-22 22:28:59 -04:00
Max Woghiren
ddac192c4a
Added gradle distribution URL updating.
...
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
2014-09-22 22:27:43 -04:00
Andrew Grieve
69a03c2e16
CB-7512 Use a standard build.gradle for all plugins
...
Plugins can extend it by providing a "build-extras.gradle"
2014-09-22 22:27:43 -04:00
Andrew Grieve
2b128b85f7
CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
2014-09-22 20:54:28 -04:00
Max Woghiren
b09f973231
Added gradle distribution URL updating.
2014-09-22 16:47:01 -04:00
Andrew Grieve
95815a558c
Merge branch 'master' into 4.0.x (fix ant run command)
2014-09-22 15:38:59 -04:00
Andrew Grieve
879da03438
CB-7579 Fix run script's ability to use non-arch-specific APKs
2014-09-22 14:23:30 -04:00
Andrew Grieve
d022be547b
Merge branch 'master' into 4.0.x (gradle)
2014-09-17 21:27:55 -04:00
Andrew Grieve
3f83fdbfc1
CB-7512 Fix gradle asking for release password when building for debug
2014-09-17 21:27:06 -04:00
Ian Clelland
215adab1f9
Merge branch 'master' into 4.0.x (Gradle env vars)
2014-09-17 15:58:46 -04:00
Ian Clelland
7ce46ed60c
CB-3445: Make minSdkVersion and base versionCode settable through env vars
2014-09-17 15:58:22 -04:00
Andrew Grieve
c32bcca67b
Merge branch 'master' into 4.0.x (gradle optional password)
2014-09-17 15:30:20 -04:00
Andrew Grieve
cb442364ca
CB-7512 Make key password optional & prompt for it when missing
2014-09-17 15:29:57 -04:00
Andrew Grieve
6bdc01290d
Merge branch 'master' into 4.0.x (gradle fix)
2014-09-16 15:15:11 -04:00
Andrew Grieve
ac34bf1e54
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
2014-09-16 15:14:40 -04:00
Andrew Grieve
6fb164d200
Merge branch 'master' into 4.0.x (unaligned apk fix)
2014-09-16 15:00:54 -04:00
Andrew Grieve
a5d300c6ff
CB-7512 Use aligned apk rather than unaligned apk when sorting
2014-09-16 14:59:43 -04:00
Andrew Grieve
6eb4409a72
Merge branch 'master' into 4.0.x (gradle debug v release)
2014-09-16 14:14:46 -04:00
Andrew Grieve
533677df8b
CB-7512 Speed up gradle builds by building debug or release (not both)
2014-09-16 14:13:49 -04:00
Andrew Grieve
8f27b2ab56
Merge branch 'master' into 4.0.x (gradle fixes)
2014-09-16 13:02:55 -04:00
Andrew Grieve
25be42d385
CB-7512 Add gradle environment vars for signing apks
2014-09-16 13:01:25 -04:00
