0d313a3964
gradle: Write sub-project list explicitly to make Android Studio happy
2014-09-23 21:03:00 -04:00
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
2b128b85f7
CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
2014-09-22 20:54:28 -04:00
d022be547b
Merge branch 'master' into 4.0.x (gradle)
2014-09-17 21:27:55 -04:00
3f83fdbfc1
CB-7512 Fix gradle asking for release password when building for debug
2014-09-17 21:27:06 -04:00
215adab1f9
Merge branch 'master' into 4.0.x (Gradle env vars)
2014-09-17 15:58:46 -04:00
7ce46ed60c
CB-3445: Make minSdkVersion and base versionCode settable through env vars
2014-09-17 15:58:22 -04:00
c32bcca67b
Merge branch 'master' into 4.0.x (gradle optional password)
2014-09-17 15:30:20 -04:00
cb442364ca
CB-7512 Make key password optional & prompt for it when missing
2014-09-17 15:29:57 -04:00
8f27b2ab56
Merge branch 'master' into 4.0.x (gradle fixes)
2014-09-16 13:02:55 -04:00
25be42d385
CB-7512 Add gradle environment vars for signing apks
2014-09-16 13:01:25 -04:00
00f6d30e08
CB-7512 Change gradle android plugins from 0.10 -> 0.12
2014-09-16 13:00:27 -04:00
d9900a725d
Second part of CB-7499, support RTL text direction
2014-09-15 16:03:00 -04:00
4c1efe7ad4
Merge branch 'master' into 4.0.x
2014-09-15 12:16:03 -04:00
4be92f285a
CB-7512: Fix logic for detecting SDK directory
2014-09-15 12:15:32 -04:00
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
0e78dc35d8
CB-7512: Read android target from project.properties if possible
2014-09-10 11:39:29 -04:00
c8bbdb23de
CB-7512: Determine SDK and build tools version dynamcally at build time
2014-09-10 10:57:43 -04:00
7ee8117186
CB-7463: Adding licence to project template gradle file
2014-09-10 10:54:21 -04:00
623b2306ca
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:51 -04:00
34dde53506
CB-3445: Add environment variable 'BUILD_MULTIPLE_APKS' for splitting APKs based on architecture
2014-08-28 16:18:02 -04:00
7a09182446
CB-3445: Ensure that JAR files in libs directory are included
2014-08-28 13:17:26 -04:00
233e513860
CB-3445: Ensure that JAR files in libs directory are included
2014-08-28 11:26:58 -04:00
b2776269cf
Merge branch 'master' into 4.0.x (Gradle library dependencies)
2014-08-20 11:43:58 -04:00
b6c5a5fc9a
CB-3445: Read project.properties to configure gradle libraries
2014-08-20 11:42:04 -04:00
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
71e72f215d
CB-7335 Add a .gitignore to android project template
2014-08-19 11:59:18 -04:00
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
a91bd095b0
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-08-18 09:48:31 -04:00
8aa813b862
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-08-18 09:48:31 -04:00
1571b26a65
Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
framework/src/org/apache/cordova/CordovaWebViewClient.java
framework/src/org/apache/cordova/PluginManager.java
2014-07-07 16:23:51 -04:00
0f15608175
CB-4404 Revert setting android:windowSoftInputMode to "adjustPan"
...
"adjustResize" is what the value has been set to for the longest time (due to it
being in the wrong place in the manifest). "adjustResize" is a better default value anyways.
2014-07-07 13:07:51 -04:00
705991e5b0
Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init()
...
This does subtly change the API surface due to CordovaWebView.init(),
but only minimally, and is backwards compatibly with the default
generated projects from prior versions.
2014-07-04 16:32:09 -04:00
96a1192474
Merge branch 'master' into 4.0.x (back button default behaviour fix)
...
Conflicts:
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-06-23 14:50:01 -04:00
0ffb5d253a
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-06-19 16:12:40 -04:00
fa189b3234
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-06-17 17:36:26 -04:00
663a919ed1
CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works
2014-06-12 11:47:41 -07:00
6abb9da88a
Merge branch 'master' into 4.0.x
...
Conflicts:
bin/templates/project/custom_rules.xml
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/junit/MessageTest.java
2014-06-08 22:54:21 -04:00
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
743541218f
CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
2014-06-03 16:08:35 -04:00
94de0a7ce2
Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
2014-06-03 15:29:06 -04:00
4a67dd2e28
Crosswalk runtime needs the two permissions to auto detect connection status.
...
See more details at: https://crosswalk-project.org/jira/browse/XWALK-1324
2014-04-29 22:50:11 -04:00
298cd9e065
Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app
2014-04-01 11:33:40 -04:00
87285d94f7
CB-5908: add splascreen images to template
...
This will enable the default splashscreens to reside in the correct place
after creating a new project. Before only the default icons were present.
I copied these from cordova-app-hello-world.
2014-02-10 16:56:45 -05:00
5b2a73e3eb
CB-5715 For CLI, hide assets/www and res/xml/config.xml by default
...
Add a helper file under assets to say how to re-show the hidden files.
Move the config.xml, www, merges entries to the root to be more discoverable.
2014-01-28 00:28:42 -05:00
6f163a6ba5
CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ as a project when importing
2014-01-25 21:58:28 -05:00
1fe7bbbbc4
CB-5793 Make ant work-around work on windows.
2014-01-21 21:14:32 -05:00
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
fcae58d355
CB-4910 Fix CLI's eclipse project template not working on windows due to "*" in the virtual folder name.
2014-01-17 12:00:29 -05:00
51abf5b0a6
CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
2014-01-14 12:29:53 -05:00
Andrew Grieve