cordova-android.git
29 hours agoRemove obsolete jshint comments (#444) master
Raphael von der Grün [Mon, 21 May 2018 10:02:14 +0000 (12:02 +0200)] 
Remove obsolete jshint comments (#444)

29 hours agoMerge pull request #443 from raphinesse/eslint
Shazron Abdullah [Mon, 21 May 2018 10:00:44 +0000 (18:00 +0800)] 
Merge pull request #443 from raphinesse/eslint

Improve ESLint script

2 days agoImprove ESLint script 443/head
Raphael von der Grün [Sat, 19 May 2018 21:08:24 +0000 (23:08 +0200)] 
Improve ESLint script

It now lints all files in one go and lints a few extra files.

4 weeks agoMerge pull request #437 from jcesarmobile/CB-14038
Joe Bowser [Thu, 19 Apr 2018 18:08:54 +0000 (11:08 -0700)] 
Merge pull request #437 from jcesarmobile/CB-14038

CB-14038 (android): fix false positive detecting project type

I agree @jcesarmobile, it can wait for a future release.

4 weeks agoCB-14038 (android): fix false positive detecting project type 437/head
Julio César [Wed, 18 Apr 2018 11:16:54 +0000 (13:16 +0200)] 
CB-14038 (android): fix false positive detecting project type

5 weeks agoMerge pull request #436 from infil00p/update_gradle_deps
Joe Bowser [Tue, 10 Apr 2018 20:58:31 +0000 (13:58 -0700)] 
Merge pull request #436 from infil00p/update_gradle_deps

CB-14008: Updating Gradle Libraries to work with Android Studio 3.1.0

6 weeks agoCB-14008: Updating Gradle Libraries to work with Android Studio 3.1.0 436/head
Joe Bowser [Wed, 4 Apr 2018 20:54:39 +0000 (13:54 -0700)] 
CB-14008: Updating Gradle Libraries to work with Android Studio 3.1.0

7 weeks agoMerge pull request #435 from richturner/master
Joe Bowser [Tue, 27 Mar 2018 20:50:26 +0000 (13:50 -0700)] 
Merge pull request #435 from richturner/master

CB-13975: (android) Fix to fire pause event when cdvStartInBackground=true

8 weeks agoMerge pull request #434 from infil00p/CB-13830
Joe Bowser [Mon, 26 Mar 2018 23:08:22 +0000 (16:08 -0700)] 
Merge pull request #434 from infil00p/CB-13830

CB-13830: Add handlers for plugins that use non-Java source files

8 weeks agoCB-13975: (android) Fix to fire pause event when cdvStartInBackground=true 435/head
Rich Turner [Fri, 23 Mar 2018 20:19:52 +0000 (20:19 +0000)] 
CB-13975: (android) Fix to fire pause event when cdvStartInBackground=true

2 months agoCB-13830: Add handlers for plugins that use non-Java source files, such as Camera 434/head
Joe Bowser [Mon, 19 Mar 2018 20:20:09 +0000 (13:20 -0700)] 
CB-13830: Add handlers for plugins that use non-Java source files, such as Camera

2 months agoMerge pull request #433 from AnthonyWard/master
Joe Bowser [Wed, 7 Mar 2018 21:26:28 +0000 (13:26 -0800)] 
Merge pull request #433 from AnthonyWard/master

CB-13923 (android) fix -1 length for compressed files

2 months agoCB-13923 (android) fix -1 length for compressed files 433/head
Anthony Ward [Tue, 27 Feb 2018 12:39:30 +0000 (12:39 +0000)] 
CB-13923 (android) fix -1 length for compressed files

2 months agoUpdate JS snapshot to version 7.2.0-dev (via coho)
Steve Gill [Wed, 21 Feb 2018 18:52:02 +0000 (10:52 -0800)] 
Update JS snapshot to version 7.2.0-dev (via coho)

2 months agoSet VERSION to 7.2.0-dev (via coho)
Steve Gill [Wed, 21 Feb 2018 18:52:01 +0000 (10:52 -0800)] 
Set VERSION to 7.2.0-dev (via coho)

2 months agoCB-13912 Updated RELEASENOTES and Version for release 7.1.0
Steve Gill [Wed, 21 Feb 2018 18:50:50 +0000 (10:50 -0800)] 
CB-13912 Updated RELEASENOTES and Version for release 7.1.0

2 months agoCB-13912: updated .ratignore to include build diectory
Steve Gill [Tue, 20 Feb 2018 19:36:55 +0000 (11:36 -0800)] 
CB-13912: updated .ratignore to include build diectory

2 months agoCB-13912 Updated checked-in node_modules
Steve Gill [Tue, 20 Feb 2018 19:17:05 +0000 (11:17 -0800)] 
CB-13912 Updated checked-in node_modules

3 months ago:arrow_up: Bump gradle tools dependency to 3.0.1 for project template
Simon MacDonald [Thu, 15 Feb 2018 22:42:10 +0000 (17:42 -0500)] 
:arrow_up: Bump gradle tools dependency to 3.0.1 for project template

3 months agoCB-13879 updated gradle plugin
Steve Gill [Thu, 15 Feb 2018 00:54:06 +0000 (16:54 -0800)] 
CB-13879 updated gradle plugin

3 months agoMerge pull request #431 from sunday18/patch-1
Joe Bowser [Fri, 26 Jan 2018 20:32:53 +0000 (12:32 -0800)] 
Merge pull request #431 from sunday18/patch-1

CB-13818: (android) Update android_sdk.js to support Android Oreo 8.0 (API 26) emulator

3 months agoMerge pull request #430 from abernix/abernix/bump-android-versions
Joe Bowser [Fri, 26 Jan 2018 16:02:35 +0000 (08:02 -0800)] 
Merge pull request #430 from abernix/abernix/bump-android-versions

CB-13831: (android) Update `android-versions` to 1.3.0 to support SDK 27.

3 months agoUpdate android_sdk.js 431/head
sunday18 [Fri, 26 Jan 2018 06:21:53 +0000 (06:21 +0000)] 
Update android_sdk.js

Update `android_sdk.js` to support Android Oreo (API 26) emulator

3 months agoCB-13831: (android) Update `android-versions` to 1.3.0 to support SDK 27. 430/head
Jesse Rosenberger [Thu, 25 Jan 2018 18:03:00 +0000 (20:03 +0200)] 
CB-13831: (android) Update `android-versions` to 1.3.0 to support SDK 27.

The `android-versions@1.3.0` version now has support for Android SDK level
27 thanks to https://github.com/dvoiss/android-versions/commit/230957205eeb26e569096251a32179e88a28acfc.

As the `android-versions` npm is a "bundled dependency" this will only
take effect when a new version of `cordova-android` is published, since
bundled dependencies are packed within the npm at publish time, not
automatically fetched as dependencies at publish time (which would have
normally been covered for new installations of cordova-android@7.0.0
thanks to semver caret notation).

4 months agoMerge pull request #429 from BBosman/cb13800
Joe Bowser [Fri, 19 Jan 2018 19:09:40 +0000 (11:09 -0800)] 
Merge pull request #429 from BBosman/cb13800

CB-13800: Drop pre-KitKat specific code

4 months agoCB-13800: (android) Drop pre-KitKat specific code 429/head
Bas Bosman [Fri, 19 Jan 2018 12:48:22 +0000 (13:48 +0100)] 
CB-13800: (android) Drop pre-KitKat specific code

4 months agoMerge pull request #426 from infil00p/api_level_bump
Joe Bowser [Wed, 17 Jan 2018 19:48:51 +0000 (11:48 -0800)] 
Merge pull request #426 from infil00p/api_level_bump

CB-13724: Bump Target SDK to API 27

4 months agoMerge pull request #427 from infil00p/deleteDeprecatedNdk
Joe Bowser [Wed, 10 Jan 2018 20:08:46 +0000 (12:08 -0800)] 
Merge pull request #427 from infil00p/deleteDeprecatedNdk

CB-13646: End of an era.  Using the deprecated NDK by default breaks …

4 months agoCB-13646: End of an era. Using the deprecated NDK by default breaks the build. ... 427/head
Joe Bowser [Mon, 8 Jan 2018 22:52:46 +0000 (14:52 -0800)] 
CB-13646: End of an era.  Using the deprecated NDK by default breaks the build.  Crosswalk users need to specify the Gradle parameters to keep it working.

4 months agoCB-13724: Updated the Android Tooling required for the latest version on both the... 426/head
Joe Bowser [Thu, 4 Jan 2018 23:35:04 +0000 (15:35 -0800)] 
CB-13724: Updated the Android Tooling required for the latest version on both the test project, and the template

4 months agoMerge pull request #425 from deton/fix-nullresult-fromthread
Joe Bowser [Wed, 3 Jan 2018 19:24:24 +0000 (11:24 -0800)] 
Merge pull request #425 from deton/fix-nullresult-fromthread

CB-12218: (android) Fix consistency of null result message

4 months agoCB-13724: Bump Target SDK to API 27
Joe Bowser [Tue, 2 Jan 2018 22:38:03 +0000 (14:38 -0800)] 
CB-13724: Bump Target SDK to API 27

4 months agoMerge pull request #422 from themightychris/patch-2
Joe Bowser [Tue, 2 Jan 2018 22:34:17 +0000 (14:34 -0800)] 
Merge pull request #422 from themightychris/patch-2

Prevent crash when unrecognized android version encounterd

4 months agoMerge pull request #424 from jcesarmobile/CB-13721
Joe Bowser [Tue, 2 Jan 2018 21:41:45 +0000 (13:41 -0800)] 
Merge pull request #424 from jcesarmobile/CB-13721

CB-13721 (Android): fix build apps that use cdvHelpers.getConfigPreference

4 months agoCB-12218: (android) Fix consistency of null result message 425/head
KIHARA Hideto [Tue, 2 Jan 2018 03:41:17 +0000 (12:41 +0900)] 
CB-12218: (android) Fix consistency of null result message

Fix problem that JavaScript receives ""(empty string) instead of null
if plugin sends null result from new thread.

4 months agoCB-13721 (Android): fix build apps that use cdvHelpers.getConfigPreference 424/head
Julio César [Sat, 30 Dec 2017 00:07:45 +0000 (01:07 +0100)] 
CB-13721 (Android): fix build apps that use cdvHelpers.getConfigPreference

4 months agoCB-13571: (android) Prevent crash with unrecognized android version 422/head
Chris Alfano [Fri, 22 Dec 2017 20:54:12 +0000 (15:54 -0500)] 
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>
5 months agoMerge pull request #421 from infil00p/test-sdk-bump
Joe Bowser [Mon, 18 Dec 2017 20:19:24 +0000 (12:19 -0800)] 
Merge pull request #421 from infil00p/test-sdk-bump

CB-12914: Test needs SDK bumps

5 months agoCB-12914: Test needs SDK bumps 421/head
Joe Bowser [Thu, 14 Dec 2017 21:24:28 +0000 (13:24 -0800)] 
CB-12914: Test needs SDK bumps

5 months agoMerge pull request #420 from infil00p/CB12914
Joe Bowser [Thu, 14 Dec 2017 17:58:18 +0000 (09:58 -0800)] 
Merge pull request #420 from infil00p/CB12914

CB-12914: Forgot to bump AndroidManifest.xml for play store reasons

5 months agoForgot to bump AndroidManifest.xml for play store reasons 420/head
Joe Bowser [Tue, 12 Dec 2017 20:49:54 +0000 (12:49 -0800)] 
Forgot to bump AndroidManifest.xml for play store reasons

5 months agoCB-13621: eslint error
Joe Bowser [Thu, 30 Nov 2017 19:08:39 +0000 (11:08 -0800)] 
CB-13621: eslint error

5 months agoCB-13622: Testing commit
Joe Bowser [Thu, 30 Nov 2017 18:56:28 +0000 (10:56 -0800)] 
CB-13622: Testing commit

5 months agoCB-13621: Wrote similar warning to CB-12948 on iOS. We no longer support update.
Joe Bowser [Thu, 30 Nov 2017 18:40:07 +0000 (10:40 -0800)] 
CB-13621: Wrote similar warning to CB-12948 on iOS.  We no longer support update.

5 months agoUpdate JS snapshot to version 7.1.0-dev (via coho)
Joe Bowser [Thu, 30 Nov 2017 18:01:30 +0000 (10:01 -0800)] 
Update JS snapshot to version 7.1.0-dev (via coho)

5 months agoSet VERSION to 7.1.0-dev (via coho)
Joe Bowser [Thu, 30 Nov 2017 18:01:28 +0000 (10:01 -0800)] 
Set VERSION to 7.1.0-dev (via coho)

5 months agoCB-13620 Updated RELEASENOTES and Version for release 7.0.0
Joe Bowser [Thu, 30 Nov 2017 17:42:11 +0000 (09:42 -0800)] 
CB-13620 Updated RELEASENOTES and Version for release 7.0.0

5 months agoCB-13741: Updating checked-in node_modules, otherwise plugin installation fails
Joe Bowser [Wed, 29 Nov 2017 21:32:12 +0000 (13:32 -0800)] 
CB-13741: Updating checked-in node_modules, otherwise plugin installation fails

5 months agoMerge pull request #419 from dpogue/signing-fix
Joe Bowser [Wed, 29 Nov 2017 20:21:53 +0000 (12:21 -0800)] 
Merge pull request #419 from dpogue/signing-fix

CB-13615: Fix paths to signing properties files

5 months agoCB-13615: Fix paths to signing properties files 419/head
Darryl Pogue [Wed, 29 Nov 2017 18:56:05 +0000 (10:56 -0800)] 
CB-13615: Fix paths to signing properties files

5 months agoMerge pull request #389 from infil00p/StudioProjectCompat
Joe Bowser [Wed, 29 Nov 2017 17:55:37 +0000 (09:55 -0800)] 
Merge pull request #389 from infil00p/StudioProjectCompat

CB-11244: Studio Project Compatibility: Now with merge commit

5 months agoFixed typo in the gradle file 389/head
Joe Bowser [Tue, 28 Nov 2017 22:59:50 +0000 (14:59 -0800)] 
Fixed typo in the gradle file

5 months agoCB-13612: eslint fix
Joe Bowser [Tue, 28 Nov 2017 21:09:07 +0000 (13:09 -0800)] 
CB-13612: eslint fix

5 months agoCB-13612: Fix the remapper so that XML files copy over and the Camera works again.
Joe Bowser [Tue, 28 Nov 2017 20:57:00 +0000 (12:57 -0800)] 
CB-13612: Fix the remapper so that XML files copy over and the Camera works again.

5 months agoCB-13741: Bump package.json so we can install plugins
Joe Bowser [Tue, 28 Nov 2017 19:31:04 +0000 (11:31 -0800)] 
CB-13741: Bump package.json so we can install plugins

5 months agoMerge branch 'master' into StudioProjectCompat
Joe Bowser [Tue, 28 Nov 2017 18:35:45 +0000 (10:35 -0800)] 
Merge branch 'master' into StudioProjectCompat

5 months agoMerge pull request #418 from dpogue/splash-compress
Joe Bowser [Tue, 28 Nov 2017 18:35:04 +0000 (10:35 -0800)] 
Merge pull request #418 from dpogue/splash-compress

CB-13610: Compress the default app assets

5 months agoMerge pull request #385 from dreifachstein/master
Joe Bowser [Tue, 28 Nov 2017 18:34:19 +0000 (10:34 -0800)] 
Merge pull request #385 from dreifachstein/master

CB-12835: add a Context getter in CordovaInterface

5 months agoCB-13610: Compress the default app assets 418/head
Darryl Pogue [Tue, 28 Nov 2017 06:46:02 +0000 (22:46 -0800)] 
CB-13610: Compress the default app assets

5 months agoMerge branch 'master' into StudioProjectCompat
Joe Bowser [Mon, 27 Nov 2017 22:10:59 +0000 (14:10 -0800)] 
Merge branch 'master' into StudioProjectCompat

Merge by hand CB-8976

5 months agoMerge pull request #401 from fabulant/CB-8976
Joe Bowser [Mon, 27 Nov 2017 22:02:20 +0000 (14:02 -0800)] 
Merge pull request #401 from fabulant/CB-8976

CB-8976: Added the `cdvVersionCodeForceAbiDigit` property

5 months agoMerge branch 'master' into StudioProjectCompat
Joe Bowser [Mon, 27 Nov 2017 19:42:25 +0000 (11:42 -0800)] 
Merge branch 'master' into StudioProjectCompat

5 months agoMerge pull request #352 from Icenium/include-armeabi-dir
Joe Bowser [Mon, 27 Nov 2017 19:35:47 +0000 (11:35 -0800)] 
Merge pull request #352 from Icenium/include-armeabi-dir

CB-12291: (android) Add x86_64, arm64 and armeabi architecture flavors

5 months agoCB-13602: We were setting the path wrong, this is hacky but it works
Joe Bowser [Wed, 22 Nov 2017 21:18:38 +0000 (13:18 -0800)] 
CB-13602: We were setting the path wrong, this is hacky but it works

5 months agoCB-13601: Fixing lint error and mis-spelling of variable
Joe Bowser [Wed, 22 Nov 2017 19:47:05 +0000 (11:47 -0800)] 
CB-13601: Fixing lint error and mis-spelling of variable

5 months agoCB-13601: Fixing the standalone run scripts to make sure this works without using...
Joe Bowser [Wed, 22 Nov 2017 19:39:40 +0000 (11:39 -0800)] 
CB-13601: Fixing the standalone run scripts to make sure this works without using the CLI

6 months agoMerge branch 'master' into StudioProjectCompat
Joe Bowser [Tue, 21 Nov 2017 02:21:49 +0000 (18:21 -0800)] 
Merge branch 'master' into StudioProjectCompat

Fixing conflict caused by merging #417 into master

6 months agoMerge branch 'master' into StudioProjectCompat
Joe Bowser [Mon, 20 Nov 2017 21:53:00 +0000 (13:53 -0800)] 
Merge branch 'master' into StudioProjectCompat

6 months agoMerge pull request #417 from DavidStrausz/master
Joe Bowser [Thu, 16 Nov 2017 18:13:50 +0000 (10:13 -0800)] 
Merge pull request #417 from DavidStrausz/master

CB-13580: (android) fix build for multiple apks (different product flavors)

6 months agoCB-13580: (android) fix lint errors 417/head
David Strauß [Thu, 16 Nov 2017 00:54:04 +0000 (01:54 +0100)] 
CB-13580: (android) fix lint errors

6 months agoCB-13580: fix build for multiple apks (different product flavors)
David Strauß [Thu, 16 Nov 2017 00:27:20 +0000 (01:27 +0100)] 
CB-13580: fix build for multiple apks (different product flavors)

6 months agoCB-13297: This just works once you bump the project structure. Java 1.8 compatibilit...
Joe Bowser [Wed, 15 Nov 2017 19:39:32 +0000 (11:39 -0800)] 
CB-13297: This just works once you bump the project structure.  Java 1.8 compatibility baked-in

6 months agoMerge pull request #416 from infil00p/bintray_fix
Joe Bowser [Wed, 15 Nov 2017 18:42:00 +0000 (10:42 -0800)] 
Merge pull request #416 from infil00p/bintray_fix

CB-13558: Upgrading the gradle so we can upload the AAR

6 months agoCB-13558: Upgrading the gradle so we can upload the AAR 416/head
Joe Bowser [Thu, 9 Nov 2017 19:14:47 +0000 (11:14 -0800)] 
CB-13558: Upgrading the gradle so we can upload the AAR

6 months agoMerge branch 'master' into StudioProjectCompat
Joe Bowser [Tue, 7 Nov 2017 18:52:37 +0000 (10:52 -0800)] 
Merge branch 'master' into StudioProjectCompat

6 months agoUpdate JS snapshot to version 6.5.0-dev (via coho)
Joe Bowser [Mon, 6 Nov 2017 19:44:23 +0000 (11:44 -0800)] 
Update JS snapshot to version 6.5.0-dev (via coho)

6 months agoSet VERSION to 6.5.0-dev (via coho)
Joe Bowser [Mon, 6 Nov 2017 19:44:20 +0000 (11:44 -0800)] 
Set VERSION to 6.5.0-dev (via coho)

6 months agoCB-13528 Updated RELEASENOTES and Version for release 6.4.0
Joe Bowser [Mon, 6 Nov 2017 19:43:47 +0000 (11:43 -0800)] 
CB-13528 Updated RELEASENOTES and Version for release 6.4.0

6 months agoMerge pull request #415 from infil00p/CB-13530
Joe Bowser [Fri, 3 Nov 2017 23:50:32 +0000 (16:50 -0700)] 
Merge pull request #415 from infil00p/CB-13530

CB-13530: Fix the utility method for finding the built APK for generic APKs

6 months agoCB-13530: Removing debug console.logs 415/head
Joe Bowser [Thu, 2 Nov 2017 21:45:51 +0000 (14:45 -0700)] 
CB-13530: Removing debug console.logs

6 months agoCB-13530: This fixes the basic APK installation
Joe Bowser [Thu, 2 Nov 2017 21:17:10 +0000 (14:17 -0700)] 
CB-13530: This fixes the basic APK installation

6 months agoeslint fix
Joe Bowser [Thu, 2 Nov 2017 00:18:41 +0000 (17:18 -0700)] 
eslint fix

6 months agoCB-11244: Android Studio 3 work, things have changed with how the platform is built
Joe Bowser [Thu, 2 Nov 2017 00:08:43 +0000 (17:08 -0700)] 
CB-11244: Android Studio 3 work, things have changed with how the platform is built

6 months agoCompleting merge which includes the fix for Android Studio 3.0
Joe Bowser [Wed, 1 Nov 2017 20:46:23 +0000 (13:46 -0700)] 
Completing merge which includes the fix for Android Studio 3.0

6 months agoCB-11244: Found bug where the gradle subproject changes weren't actually getting...
Joe Bowser [Wed, 1 Nov 2017 20:22:22 +0000 (13:22 -0700)] 
CB-11244: Found bug where the gradle subproject changes weren't actually getting written to the correct gradle file

6 months agoMerge pull request #413 from infil00p/StudioThreeFix
Joe Bowser [Wed, 1 Nov 2017 17:26:53 +0000 (10:26 -0700)] 
Merge pull request #413 from infil00p/StudioThreeFix

CB-13289: This fixes the Cordova-Android build on cordova-android 6.x

6 months agoCB-13289: Updating Travis and appveyor 413/head
Joe Bowser [Tue, 31 Oct 2017 17:48:19 +0000 (10:48 -0700)] 
CB-13289: Updating Travis and appveyor

6 months agoMerge pull request #414 from audreyso/CB-13501
Audrey [Mon, 30 Oct 2017 23:11:50 +0000 (16:11 -0700)] 
Merge pull request #414 from audreyso/CB-13501

CB-13501 : update appveyor to support node 8

6 months agoCB-13289: eslint fix
Joe Bowser [Mon, 30 Oct 2017 20:17:18 +0000 (13:17 -0700)] 
CB-13289: eslint fix

6 months agoCB-13289: Fixing build problems with Studio Three, but keeping Windows Gradle fix...
Joe Bowser [Mon, 30 Oct 2017 17:39:59 +0000 (10:39 -0700)] 
CB-13289: Fixing build problems with Studio Three, but keeping Windows Gradle fix for now, will be deprecated

6 months ago:CB-13501 : update appveyor node versions to support node 8 414/head
Audrey So [Mon, 30 Oct 2017 17:01:50 +0000 (10:01 -0700)] 
:CB-13501 : update appveyor node versions to support node 8

6 months agoCB-13499: Remove duplicate "setting" in error strings
Jan Piotrowski [Thu, 26 Oct 2017 20:28:38 +0000 (22:28 +0200)] 
CB-13499: Remove duplicate "setting" in error strings

6 months agoCB-13289: Fix test to work with new Google Android Gradle DSL
Joe Bowser [Wed, 25 Oct 2017 18:38:07 +0000 (11:38 -0700)] 
CB-13289: Fix test to work with new Google Android Gradle DSL

7 months agoeslint errors
Joe Bowser [Thu, 19 Oct 2017 20:37:43 +0000 (13:37 -0700)] 
eslint errors

7 months agoCB-13470: Fix Clean so that it cleans the Android Studio structure
Joe Bowser [Thu, 19 Oct 2017 20:31:16 +0000 (13:31 -0700)] 
CB-13470: Fix Clean so that it cleans the Android Studio structure

7 months agoRedoing PR #411 over here because the changes were obliterated from earlier
Joe Bowser [Wed, 18 Oct 2017 18:09:08 +0000 (11:09 -0700)] 
Redoing PR #411 over here because the changes were obliterated from earlier

7 months agoMerge branch 'master' into StudioProjectCompat, fixing conflicts, need
Joe Bowser [Wed, 18 Oct 2017 18:04:44 +0000 (11:04 -0700)] 
Merge branch 'master' into StudioProjectCompat, fixing conflicts, need
to re-add previous PR fix on the branch

7 months agoMerge pull request #411 from Keyclic/master
Joe Bowser [Mon, 16 Oct 2017 18:23:29 +0000 (11:23 -0700)] 
Merge pull request #411 from Keyclic/master

CB-12802: (android) Fix build.gradle to sign when building with multiple APK is enable.

7 months agoMerge pull request #410 from filmaj/emu-fixes
Joe Bowser [Mon, 16 Oct 2017 17:37:30 +0000 (10:37 -0700)] 
Merge pull request #410 from filmaj/emu-fixes

CB-13404, CB-13406: `best_image` function fixes when choosing emulator images to deploy to

7 months agoClose #379
Joe Bowser [Fri, 13 Oct 2017 18:08:01 +0000 (11:08 -0700)] 
Close #379