Commit Graph

90 Commits

Author SHA1 Message Date
Joe Bowser e621edfba7 Fixing the Android Studio detection and making it automatically pick the right builder, good for upgrading Cordova 2017-06-14 09:57:27 -07:00
Joe Bowser 8391af2e8f JsHint Fixes, deleting unused methods 2017-06-14 09:57:27 -07:00
Joe Bowser a216f0db75 CB-11244: Changing directory creation, will most likely hide this behind a flag for the next release of Cordova-Android, and then make it default in the next major pending feedback 2017-06-14 09:57:27 -07:00
Joe Bowser 8ead919fae Managed to get the project to mostly compile, still need to re-work the build command to add the app project 2017-06-14 09:57:26 -07:00
Joe Bowser f790aeb8f6 Setting up the create command so we actually have all the directories in the right place, and define default variables in the top level build.gradle 2017-06-14 09:57:26 -07:00
Joe Bowser 23d8d99925 Moving Android Manifest finding to the Gradle and Studio builders. 2017-06-14 09:57:25 -07:00
filmaj 884818934f CB-12546: on create, update the require path for certain helper modules as directory structure differs. big ol TODO dropped as it _is_ kinda weird. 2017-03-20 10:09:45 -07:00
filmaj d40c22441f CB-12546: move check_reqs to templates directory and update module references. 2017-03-20 10:08:36 -07:00
filmaj a7ef686a27 CB-12546: leverage avdmanager if android warns it is no longer
useful, which happens in Android SDK Tools 25.3.1.
explicitly set the CWD of the spawned emulator process to workaround a recent google android sdk bug.
rename android_sdk_version.js to android_sdk.js, to better reflect its contents.
have create.js copy over the android_sdk_version batch file.
2017-03-20 10:08:35 -07:00
Joe Bowser e182e669f0 CB-12524: Put the script in the wrong spot, oops
This closes #367
2017-03-13 13:51:37 -07:00
Joe Bowser b2664bc469 CB-12524: Test distributing a wrapper in the framework directory 2017-03-13 13:51:36 -07:00
Joe Bowser d3cb38de29 Bump Target and Min API levels 2016-09-06 10:42:51 -07:00
Richard Knoll 9738079c42 CB-11259: Improving build output
This closes #305
2016-05-17 13:31:12 -07:00
Vladimir Kotikov 7be9e880c2 CB-10618 Handle gradle frameworks on plugin installation/uninstallation
This closes #259
2016-02-17 17:56:09 +03:00
Vladimir Kotikov 78fa7374d9 CB-9880 Fixes platform update failure when upgrading from android@<4.1.0 2015-10-28 12:42:35 +03:00
Steve Gill 0ac822c577 Fixed line endings 2015-10-20 16:15:57 -07:00
Vladimir Kotikov 400282282f CB-9782 Implements PlatformApi contract for Android platform.
This closes #226
2015-10-20 12:21:30 +03:00
Steve Gill 8f7bc1ffbb CB-9428 update script now bumps up minSdkVersion to 14 if it is less than that. 2015-07-31 16:32:51 -07:00
Vladimir Kotikov 4bf705a3d3 CB-8954 Adds requirements command support to check_reqs module 2015-05-29 13:00:38 +03:00
Andrew Grieve ee14a67795 CB-8884 Delete Eclipse tweaks from create script 2015-04-21 14:24:15 -04:00
Joe Bowser 151b86cb7b CB-8735: Adding link as per Ian's suggestion 2015-03-23 15:54:05 -07:00
Joe Bowser e4c9bebe34 CB-8735: Fixing the regex so that it's more compliant with Java package rules 2015-03-23 15:23:30 -07: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
Connor Pearson dcff8794ad CB-7827 Add --activity-name for bin/create
Also adds in nopt
2015-02-25 14:23:26 -05:00
Murat Sutunc dbd45d4173 fix jshint errors (close #157) 2015-02-18 21:31:43 -05:00
Andrew Grieve db18e1480e CB-8469 Create gradle build files as part of create script
Makes project imporatable by Android Studio before first build
2015-02-12 16:15:43 -05:00
Murat Sutunc aed4859642 CB-8410 Fix all jshint issues for Android platform (close #153) 2015-02-03 15:21:57 -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 a4c9bf7d30 CB-8358 Make --link an alias for --shared for create/update. Make it work with gradle 2015-01-26 10:07:14 -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 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 7ad16e5b0c Merge branch 'master' into 4.0.x (Hardcode activity name) 2014-10-07 15:25:56 -04:00
Vladimir Kotikov 9f41906895 CB-6511 Fixes build for android when app name contains unicode characters.
github: close #124
2014-10-07 15:24:12 -04:00
Andrew Grieve 862c223e11 Merge branch 'master' into 4.0.x (.gitignore, create --shared) 2014-10-04 15:30:30 -04:00
Andrew Grieve 30681eb772 Fix --shared flag of create script (broke in recent gradle changes) 2014-10-04 15:14:51 -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 0d313a3964 gradle: Write sub-project list explicitly to make Android Studio happy 2014-09-23 21:03:00 -04:00
Ian Clelland d99386ef1e Merge branch 'master' into 4.0.x 2014-09-11 15:12:31 -04:00
Ian Clelland 9ae3d2c074 CB-7512: Copy cordova.gradle file to project root on build 2014-09-11 15:12:07 -04:00
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
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 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
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 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 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
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