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,087 Commits 53 Branches 159 Tags 74 MiB
bca7f62efd
Commit Graph

188 Commits

Author SHA1 Message Date
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
84274b4259 Update JS snapshot to version 4.1.0-dev (via coho) 2015-04-09 11:05:48 -04:00
Andrew Grieve
b27d283f21 CB-8548 Fix keystore type detection (broken by 97718a0a25) 2015-04-07 20:36:13 -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
Andrew Grieve
1b4f5b13f1 CB-8548 Use debug-signing.properties and release-signing.properties when they exist 2015-02-25 14:16:29 -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
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
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
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
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
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
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
Ian Clelland
3206c2100d Merge branch 'plugin-gradle' into 4.0.x 2014-12-09 09:43:37 -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