Joe Bowser
0d1692681f
CB-13724: Updated the Android Tooling required for the latest version on both the test project, and the template
2018-01-04 15:35:04 -08:00
Joe Bowser
5c93c214b9
CB-13724: Bump Target SDK to API 27
2018-01-02 14:38:03 -08:00
Chris Alfano
109112ae75
CB-13571: (android) Prevent crash with unrecognized android version
...
Fixes issue where commands that list images will crash when an image with a version not present in `android-versions` is encountered, as is presently the case with API 27:
```
cordova run android --list
Available android devices:
Available android virtual devices:
LEVEL: null
ERROR: TypeError: Cannot read property 'semver' of null
An unexpected error has occured while running list-emulator-images with code 2: Error: /home/chris/Repositories/acp-guidelines/cordova/platforms/android/cordova/lib/list-emulator-images: Command failed with exit code 2
```
Signed-off-by: Chris Alfano <chris@jarv.us>
2017-12-22 15:56:26 -05:00
Joe Bowser
74e9e213d6
Forgot to bump AndroidManifest.xml for play store reasons
2017-12-12 12:49:54 -08:00
Joe Bowser
d8d92cae61
CB-13621: eslint error
2017-11-30 11:08:39 -08:00
Joe Bowser
52fd32c837
CB-13621: Wrote similar warning to CB-12948 on iOS. We no longer support update.
2017-11-30 10:40:07 -08:00
Joe Bowser
061f08bc03
Update JS snapshot to version 7.1.0-dev (via coho)
2017-11-30 10:01:30 -08:00
Joe Bowser
735bc98243
Set VERSION to 7.1.0-dev (via coho)
2017-11-30 10:01:28 -08:00
Darryl Pogue
8484f7b906
CB-13615: Fix paths to signing properties files
2017-11-29 10:56:05 -08:00
Joe Bowser
c6cfeb15f4
Fixed typo in the gradle file
2017-11-28 14:59:50 -08:00
Joe Bowser
adc7dab377
CB-13612: eslint fix
2017-11-28 13:09:07 -08:00
Joe Bowser
a9e01f4309
CB-13612: Fix the remapper so that XML files copy over and the Camera works again.
2017-11-28 12:57:00 -08:00
Joe Bowser
4863320e45
Merge branch 'master' into StudioProjectCompat
2017-11-28 10:35:45 -08:00
Darryl Pogue
9056e5a2dc
CB-13610: Compress the default app assets
2017-11-27 22:46:02 -08:00
Joe Bowser
2b20802dbb
Merge branch 'master' into StudioProjectCompat
...
Merge by hand CB-8976
2017-11-27 14:10:59 -08:00
Joe Bowser
a972d1ef62
Merge pull request #401 from fabulant/CB-8976
...
CB-8976: Added the `cdvVersionCodeForceAbiDigit` property
2017-11-27 14:02:20 -08:00
Joe Bowser
30c3713dca
Merge branch 'master' into StudioProjectCompat
2017-11-27 11:42:25 -08:00
Joe Bowser
6f58d4c474
Merge pull request #352 from Icenium/include-armeabi-dir
...
CB-12291: (android) Add x86_64, arm64 and armeabi architecture flavors
2017-11-27 11:35:47 -08:00
Joe Bowser
9d9bac397b
CB-13602: We were setting the path wrong, this is hacky but it works
2017-11-22 13:18:38 -08:00
Joe Bowser
d8f10c33dc
CB-13601: Fixing lint error and mis-spelling of variable
2017-11-22 11:47:05 -08:00
Joe Bowser
5d57eff612
CB-13601: Fixing the standalone run scripts to make sure this works without using the CLI
2017-11-22 11:39:40 -08:00
Joe Bowser
43956c1bc8
Merge branch 'master' into StudioProjectCompat
...
Fixing conflict caused by merging #417 into master
2017-11-20 18:21:49 -08:00
David Strauß
5d99e50c4a
CB-13580: (android) fix lint errors
2017-11-16 01:54:04 +01:00
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
