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
c3610aa43c
CB-8255 Use properties rather than environment variables for gradle settings
2015-01-08 15:26:24 -05:00
95e10bdb9e
Merge branch 'master' into 4.0.x (run --list)
2015-01-03 21:06:07 -05:00
c2a6dcb6bd
CB-8168 Add support for cordova/run --list ( closes #139 )
2015-01-03 21:05:52 -05:00
5a17d6cd5f
Merge branch 'master' into 4.0.x (gradle - maven and CordovaLib dep)
2014-12-30 22:59:50 -05:00
480af2644c
CB-8228 Gradle: Allow plugins to use Maven dependencies
2014-12-30 22:57:53 -05:00
ecd2e06883
CB-8229 Gradle: Add CordovaLib as a dependency to all plugin sub-projects
2014-12-30 22:56:43 -05:00
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
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
9224ab1592
CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
2014-12-23 15:29:40 -05:00
a696ff37f1
Merge branch 'master' into 4.0.x (Plugin set multiarach)
2014-12-22 23:19:56 -05:00
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
68c03090a3
Merge branch 'master' into 4.0.x (Gradle lint stages)
2014-12-22 13:29:50 -05:00
98fe46757f
CB-8204: Reinstate link tasks to avoid gradle build failures
2014-12-22 13:24:58 -05:00
cefd137634
Merge branch 'master' into 4.0.x (gradle version bump)
2014-12-22 11:45:02 -05:00
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
20cd4f806a
Merge branch 'master' into 4.0.x (gradle version for Android Studio)
2014-12-22 11:25:59 -05:00
b92303b1c9
CB-8143 Use gradle plugin 1.0.0 for Android Studio 1.0.0
2014-12-22 11:19:21 -05:00
59d23e05b1
Merge branch 'master' into 4.0.x (apk signing with interactive passwords)
2014-12-22 10:22:41 -05:00
731a36d3a0
CB-8202 Fix gradle build signing when passwords provided interactively
2014-12-22 10:21:17 -05:00
162fc0720e
Merge branch 'master' into 4.0.x (SDK search path)
2014-12-16 14:18:58 -05:00
342bbaa3ae
CB-8176 Update Android SDK search path for Android Studio 1.0
2014-12-16 14:17:55 -05:00
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
d80d532a2a
Fix syntax error in 3aca14d530
2014-12-10 21:16:54 -05:00
3aca14d530
CB-8147 Have corodva/build warn about unrecognized flags rather than fail
...
Close #127
2014-12-10 21:02:57 -05:00
268fea58ee
CB-7881 Android tooling shouldn't lock application directory
...
Close #130
2014-12-10 21:02:48 -05:00
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
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
f953e6adb8
CB-8143: Use the correct Android Gradle plugin for the installed Gradle version
2014-12-10 10:07:05 -05:00
ffd14fe7d9
Revert Gradle distributionUrlRegex cleanup.
...
This reverts commit 75a0a6752a
2014-12-09 14:23:38 -05:00
3206c2100d
Merge branch 'plugin-gradle' into 4.0.x
2014-12-09 09:43:37 -05:00
66fa12a091
CB-8119 Restart adb when we detect it's hung
2014-12-04 10:00:26 -05:00
b1bdf23d9c
Switch default build type to gradle (4.0.x only)
2014-12-03 10:12:31 -05:00
e597f98c62
Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)
2014-11-26 11:48:08 -05:00
7fbb2b195f
CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
2014-11-26 11:44:49 -05:00
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
9d3c13065b
CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
2014-11-06 18:27:36 -05:00
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
832e626573
CB-7726 fix typo in gitignore: ant-built -> ant-build
...
github: close #131
2014-10-27 12:33:09 -04:00
cc7d352209
Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)
2014-10-21 13:00:07 -04:00
ce5d9a2ee8
gradle: Allow storeType to be set (allows using .p12 files)
2014-10-21 12:59:34 -04:00
77c51d3ae7
gradle: Allow absolute paths to keystore files
2014-10-21 12:43:30 -04:00
7ad16e5b0c
Merge branch 'master' into 4.0.x (Hardcode activity name)
2014-10-07 15:25:56 -04:00
9f41906895
CB-6511 Fixes build for android when app name contains unicode characters.
...
github: close #124
2014-10-07 15:24:12 -04:00
9577735ff7
Merge branch 'master' into 4.0.x (check_reqs for brew)
2014-10-06 10:34:19 -04:00
2dcd50c11b
CB-7714 Teach check_reqs about brew's install location for android SDK
2014-10-06 10:33:31 -04:00
862c223e11
Merge branch 'master' into 4.0.x (.gitignore, create --shared)
2014-10-04 15:30:30 -04:00
30681eb772
Fix --shared flag of create script (broke in recent gradle changes)
2014-10-04 15:14:51 -04:00
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
e5efc91ef4
Merge branch 'master' into 4.0.x (JAVA_HOME on Ubuntu)
2014-09-29 10:16:33 -04:00
Andrew Grieve