David Strauß
|
aaeb630eb1
|
CB-13580: fix build for multiple apks (different product flavors)
|
2017-11-16 01:27:20 +01:00 |
|
Joe Bowser
|
3acba59494
|
CB-13297: This just works once you bump the project structure. Java 1.8 compatibility baked-in
|
2017-11-15 11:39:32 -08:00 |
|
Joe Bowser
|
b77febc7a7
|
Merge branch 'master' into StudioProjectCompat
|
2017-11-07 10:52:37 -08:00 |
|
Joe Bowser
|
83601dca2f
|
Update JS snapshot to version 6.5.0-dev (via coho)
|
2017-11-06 11:44:23 -08:00 |
|
Joe Bowser
|
05aeaf1bd2
|
Set VERSION to 6.5.0-dev (via coho)
|
2017-11-06 11:44:20 -08:00 |
|
Joe Bowser
|
b83c3b3684
|
CB-13530: Removing debug console.logs
|
2017-11-02 14:45:51 -07:00 |
|
Joe Bowser
|
5502ddaf0d
|
CB-13530: This fixes the basic APK installation
|
2017-11-02 14:42:39 -07:00 |
|
Joe Bowser
|
f54336eb61
|
eslint fix
|
2017-11-01 17:18:41 -07:00 |
|
Joe Bowser
|
18d6884522
|
CB-11244: Android Studio 3 work, things have changed with how the platform is built
|
2017-11-01 17:09:00 -07:00 |
|
Joe Bowser
|
8ba0109e55
|
Completing merge which includes the fix for Android Studio 3.0
|
2017-11-01 13:46:23 -07:00 |
|
Joe Bowser
|
f50ca85a95
|
CB-11244: Found bug where the gradle subproject changes weren't actually getting written to the correct gradle file
|
2017-11-01 13:22:22 -07:00 |
|
Joe Bowser
|
39e6765e64
|
Merge pull request #413 from infil00p/StudioThreeFix
CB-13289: This fixes the Cordova-Android build on cordova-android 6.x
|
2017-11-01 10:26:53 -07:00 |
|
Joe Bowser
|
a2618dcde5
|
CB-13289: eslint fix
|
2017-10-30 13:17:18 -07:00 |
|
Joe Bowser
|
9fdb126715
|
CB-13289: Fixing build problems with Studio Three, but keeping Windows Gradle fix for now, will be deprecated
|
2017-10-30 10:39:59 -07:00 |
|
Jan Piotrowski
|
04fa5d3feb
|
CB-13499: Remove duplicate "setting" in error strings
|
2017-10-26 22:28:38 +02:00 |
|
Joe Bowser
|
3ba00f91bb
|
eslint errors
|
2017-10-19 13:37:43 -07:00 |
|
Joe Bowser
|
cbee8580d0
|
CB-13470: Fix Clean so that it cleans the Android Studio structure
|
2017-10-19 13:31:16 -07:00 |
|
Joe Bowser
|
6ccd6b009b
|
Redoing PR #411 over here because the changes were obliterated from earlier
|
2017-10-18 11:09:08 -07:00 |
|
Joe Bowser
|
6cf6e20d2e
|
Merge branch 'master' into StudioProjectCompat, fixing conflicts, need
to re-add previous PR fix on the branch
|
2017-10-18 11:04:44 -07:00 |
|
Joe Bowser
|
93efe71080
|
Merge pull request #411 from Keyclic/master
CB-12802: (android) Fix build.gradle to sign when building with multiple APK is enable.
|
2017-10-16 11:23:29 -07:00 |
|
Kevin
|
cde238de94
|
Include missing values for task.name when 'cdvBuildMultipleApks' option is true, 'task.name' can have 'validateSigningArmv7Release' or 'validateSigningX86Release' values too.
|
2017-10-09 09:17:40 +02:00 |
|
filmaj
|
1f12fdbeea
|
CB-13404: add android-versions to bundledDependencies. Ignore best emulator selection when parsed AVD information does not include API level in the target
|
2017-10-05 15:17:31 -05:00 |
|
Joe Bowser
|
8743e88550
|
CB-11244: Fixing eslint errors
|
2017-10-03 15:06:54 -07:00 |
|
Joe Bowser
|
f3c238db1c
|
CB-11244: Adding specs for resource files inside an Android Studio Project
|
2017-10-03 14:16:27 -07:00 |
|
Joe Bowser
|
2534a3c767
|
CB-11244: Added remapping for drawables
|
2017-10-02 19:04:40 -07:00 |
|
Joe Bowser
|
b1f527e682
|
Merge branch 'master' into StudioProjectCompat
|
2017-09-28 10:21:49 -07:00 |
|
Joe Bowser
|
be6c6ba976
|
CB-12895: Temporarily disabling eslint since cordova-js does not have eslint yet.
|
2017-09-25 14:00:38 -07:00 |
|
Joe Bowser
|
7f3be98199
|
Update JS snapshot to version 6.4.0-dev (via coho)
|
2017-09-25 11:37:52 -07:00 |
|
Joe Bowser
|
0e498db735
|
Set VERSION to 6.4.0-dev (via coho)
|
2017-09-25 11:37:51 -07:00 |
|
Joe Bowser
|
7d282426c4
|
Merge branch 'master' into StudioProjectCompat
Another merge commit to track master changes
|
2017-09-14 11:45:57 -07:00 |
|
filmaj
|
1637937664
|
CB-12981: handle SDK 26.0.2 slightly different AVD list output for Android 8+ AVDs. Would cause "cannot read property replace of undefined" errors when trying to deploy an Android 8 emulator.
|
2017-09-14 11:26:18 -07:00 |
|
filmaj
|
03144eb160
|
Add a node and npm package.json script for running java unit tests. Include them in the top-level npm test script. Run java unit tests in travis. Small refactor in gradlebuilder to support building gradle wrapper more easily. Don't explicitly build gradlew on appveyor CI as now npm test will do it for you.
|
2017-09-14 09:57:37 -07:00 |
|
Gil Pedersen
|
cb2f396e33
|
Update maven repo to include most recent lib versions
|
2017-08-29 17:27:02 +02:00 |
|
Martin Bektchiev
|
2940d05209
|
CB-12291: (android) Add x86_64, arm64 and armeabi architecture flavors
|
2017-08-16 09:35:33 +03:00 |
|
Joe Bowser
|
8fdb16c555
|
Fixing cordova-cli related bug
|
2017-08-04 12:00:39 -07:00 |
|
Fabian Eichinger
|
940439866e
|
CB-8976: Added the cdvVersionCodeForceAbiDigit flag to the template build.gradle that appends 0 to the versionCode when cdvBuildMultipleApks is not set
|
2017-08-04 18:28:06 +02:00 |
|
Joe Bowser
|
e91b19d006
|
Fixing error caused by merge commit
|
2017-07-31 14:10:14 -07:00 |
|
Joe Bowser
|
46905ebe99
|
Merge branch 'master' into StudioProjectCompat. Dealing with latest
commits merged into master.
|
2017-07-31 13:43:21 -07:00 |
|
Nikita Matrosov
|
2b53c98cf5
|
CB-12453: Remove unnecessary double quotes from .bat files which are the causes of crash if project path contains spaces
this closes #362
|
2017-07-28 14:23:53 +03:00 |
|
Nikita Matrosov
|
36d07d7a15
|
CB-13031: Fix bug with case-sensitivity of android-packageName
this closes #397
|
2017-07-28 14:05:53 +03:00 |
|
Joe Bowser
|
d0dab4bb09
|
Merge branch 'master' into StudioProjectCompat
I fixed the master so it passes eslint.
|
2017-07-18 14:25:56 -07:00 |
|
Joe Bowser
|
893356abcd
|
CB-13034: Fixing eslint error
|
2017-07-18 14:13:53 -07:00 |
|
Joe Bowser
|
00c879e27d
|
It passed then failed. I'll change the test for now, because perfect is the enemy of good.
|
2017-07-18 11:53:44 -07:00 |
|
Joe Bowser
|
b65af106ff
|
Make the tests pass
|
2017-07-17 13:07:32 -07:00 |
|
Joe Bowser
|
fdd7eb3446
|
Linting fix
|
2017-07-14 16:51:10 -07:00 |
|
Darryl Pogue
|
22645d9158
|
[CB-10916] Support display name for Android
|
2017-07-14 17:37:15 -02:30 |
|
Joe Bowser
|
849b887e20
|
Merge branch 'master' into StudioProjectCompat
|
2017-07-12 09:39:55 -07:00 |
|
Joe Bowser
|
245d9a1e46
|
Merge branch 'master' into StudioProjectCompat
|
2017-07-12 09:33:37 -07:00 |
|
filmaj
|
5917d4ef0b
|
CB-13006: removed create and update end-to-end tests, and instead added more unit test coverage. tweaked code coverage invocation so that we get coverage details on the create.js module. slight changes to the create.js module so that it is slightly easier to test.
|
2017-07-11 12:54:15 -05:00 |
|
Joe Bowser
|
a7304b9a19
|
Finishing the linting
|
2017-06-27 13:15:04 -07:00 |
|
Nikita Matrosov
|
540929c6a0
|
CB-9971: Suppressed unwanted java stderr output when running gradle wrapper
this closes #388
|
2017-06-26 21:17:58 +03:00 |
|
Joe Bowser
|
e456175a81
|
Merge branch 'master' into StudioProjectCompat
This will have to be linted
|
2017-06-26 10:29:31 -07:00 |
|
filmaj
|
3ff32092a3
|
CB-12954 🔪 remove jshint leftovers
|
2017-06-26 12:26:53 -05:00 |
|
Audrey So
|
55d7cf3865
|
CB-12895 : updated .eslintrc file in spec dir and set jasmine true and removed root is true
|
2017-06-23 08:44:08 -07:00 |
|
Audrey So
|
d83d49d83b
|
CB-12895 : fixed eslint errors
|
2017-06-23 08:07:08 -07:00 |
|
Joe Bowser
|
b20028c42b
|
The prepare step was broken, which breaks the CLI workflow. This was caused by hardcoding the Java directory, which is a very bad idea.
|
2017-06-22 13:46:18 -07:00 |
|
Jesse MacFadyen
|
5cc14b8031
|
CB-12605 In Windows get Android studio path from the registry
This closes #387
|
2017-06-22 10:55:39 -07:00 |
|
Joe Bowser
|
1cda7a9de0
|
CB-11244: Found bug in Api.js where xml/strings.xml is used instead of values/strings.xml
|
2017-06-19 14:34:03 -07:00 |
|
Joe Bowser
|
49b76f5c71
|
Fixing mangled commits that crept into this branch
|
2017-06-14 11:36:43 -07:00 |
|
Joe Bowser
|
40c9709445
|
OK, Going back to the old build.gradle for legacy projects
|
2017-06-14 09:57:29 -07:00 |
|
Joe Bowser
|
b67e9905bc
|
This is probably a bad idea, but we need to split the gradle files into legacy and new style
|
2017-06-14 09:57:28 -07:00 |
|
Joe Bowser
|
c74192d578
|
Adding conditional code into Gradle, this is a bit dirty since we can't explicitly test it but we'll just have to rely on jasmine
|
2017-06-14 09:57:28 -07:00 |
|
Joe Bowser
|
33feb00e8f
|
Adding the if statement to see if we can support both structures with minimal editing, TODO: actually write tests for this somehow
|
2017-06-14 09:57:28 -07:00 |
|
Joe Bowser
|
8f16df4c90
|
Adding logic to upgrade both Classic and Android Studio style project structures
|
2017-06-14 09:57:28 -07:00 |
|
Joe Bowser
|
fb6cb51e64
|
Fixing lint errors
|
2017-06-14 09:57:28 -07:00 |
|
Joe Bowser
|
28ebbb8f02
|
CB-11244: Setup Api.js to support multiple builders based on project structure
|
2017-06-14 09:57:28 -07:00 |
|
Joe Bowser
|
bd4ddcdedd
|
Updated AndroidStudio to only look for the app directory to determine studio status
|
2017-06-14 09:57:28 -07:00 |
|
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
|
304a899114
|
Fixed the specification of the builders in the run command by getting build to check what was being passed from run
|
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
|
69ab6a0e0d
|
Changing the project to add the app directory as a dependency
|
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
|
69260fb96a
|
Fix the overwriting of Fil's fix, blargh
|
2017-06-14 09:57:27 -07:00 |
|
Joe Bowser
|
db87e0ae6a
|
Made changes so cordova/build builds with the new project. Need to work on plugin installation.
|
2017-06-14 09:57:26 -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
|
b73c04f3c8
|
Updating gradle version in the build file
|
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 |
|
Joe Bowser
|
d88df59c32
|
Adding the Studio Builder to build a project based on Android Studio,
and deleting Ant, since Google does not support Ant Builds anymore.
Sorry guys!
|
2017-06-14 09:57:25 -07:00 |
|
Darryl Pogue
|
7d926822ed
|
CB-8980: Ensure copied resource-files are cleaned
This closes #377
|
2017-05-25 16:11:20 -07:00 |
|
filmaj
|
d97250f968
|
Update JS snapshot to version 6.3.0-dev (via coho)
|
2017-05-02 16:19:21 -07:00 |
|
filmaj
|
9d9abea157
|
Start of GradleBuilder.js specs - puts it on the code coverage radar.
|
2017-05-02 15:31:26 -07:00 |
|
filmaj
|
e13e15d3e9
|
CB-12640: better handling of unrecognized commands on windows. removed error checking in emulator image listing when shelling out, as we already defensively dont shell out if the program is not on the PATH / not recognized. added additional test for windows unrecognized command errors for target listing. fixed up spying in a test.
|
2017-04-10 12:12:46 -07:00 |
|
filmaj
|
6ef2f67ae8
|
CB-12640: flipped avd parsing logic so that it always tries to use avdmanager to retrieve avds first, then falls back to android command if avdmanager cannot be found (and errors with ENOENT). updated tests - and added explicit tests to ensure to shell out to singular forms of sub-commands when executing android
|
2017-04-10 12:12:46 -07:00 |
|
filmaj
|
765c4ee9f6
|
CB-12640: support for android sdk tools 26.0.1. simplified target parsing by using avdmanager instead of sdkmanager. flipped target parsing logic so that it always tries to use avdmanager to retrieve targets first, then falls back to android command if avdmanager cannot be found (and errors with ENOENT). updated tests.
|
2017-04-10 12:12:46 -07:00 |
|
Steve Gill
|
8a2e96d995
|
Update JS snapshot to version 6.3.0-dev (via coho)
|
2017-03-28 15:23:50 -07:00 |
|
Steve Gill
|
13dbd2f5d4
|
Set VERSION to 6.3.0-dev (via coho)
|
2017-03-28 15:18:35 -07:00 |
|
Darryl Pogue
|
0df50c3f33
|
CB-8978 Prepare copy resource-files from config.xml
This closes #321
|
2017-03-27 22:13:13 -07:00 |
|
Alexander Sorokin
|
08c80f77a9
|
CB-12605 Fix a requirements check failure on Windows
|
2017-03-27 11:47:32 +03:00 |
|
Joe Bowser
|
ea8d65d7fc
|
CB-12595: Remove the console.log stuff
This closes #370
|
2017-03-24 10:22:11 -07:00 |
|
Joe Bowser
|
e3198b0f6b
|
CB-12595: Ugly code, but this should find an Android Studio installation and use the sweet gradle center found inside
|
2017-03-24 10:22:07 -07:00 |
|
filmaj
|
2f2e8a560d
|
CB-12546: account for quotes when detecting android command error for Windows.
|
2017-03-20 10:09:46 -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
|
1d8e6f53a1
|
CB-12546: sort detected targets by numerical suffix when reporting most recent version of android sdk target installed.
|
2017-03-20 10:09:45 -07:00 |
|
filmaj
|
3554267adf
|
CB-12546: more specs for android_sdk and check_reqs. added fixtures for sdk targets. refactored target listing.
|
2017-03-20 10:09:45 -07:00 |
|
filmaj
|
f7687a2567
|
CB-12546: use android_sdk list_targets instead of rewriting the same thing again.
|
2017-03-20 10:09:45 -07:00 |
|
filmaj
|
ebd4a02d2c
|
CB-12546: switch to superspawn for shelling out where possible. rework android sdk module to work with new sdk.
|
2017-03-20 10:09:45 -07:00 |
|
filmaj
|
4a354bba86
|
CB-12546: based on android command exit code and stdout, conditionally try to invoke avdmanager to list out AVD images. tweak relevant test to match behaviour. small tweak to use exposed methods for checking platform (for easier future stubbing).
|
2017-03-20 10:08:36 -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
|
6395eda0c8
|
CB-12546: emulator specs.
|
2017-03-20 10:08:36 -07:00 |
|