Merge branch 'master' into 6.4.x
Merging all non-StudioProjectCompat work into the 6.4.x branch for possible 6.x, or 6.4.x work in the future.
@ -93,6 +93,14 @@ GenericBuilder.prototype.extractRealProjectNameFromManifest = function () {
|
|||||||
module.exports = GenericBuilder;
|
module.exports = GenericBuilder;
|
||||||
|
|
||||||
function apkSorter (fileA, fileB) {
|
function apkSorter (fileA, fileB) {
|
||||||
|
// De-prioritize arch specific builds
|
||||||
|
var archSpecificRE = /-x86|-arm/;
|
||||||
|
if (archSpecificRE.exec(fileA)) {
|
||||||
|
return 1;
|
||||||
|
} else if (archSpecificRE.exec(fileB)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
// De-prioritize unsigned builds
|
// De-prioritize unsigned builds
|
||||||
var unsignedRE = /-unsigned/;
|
var unsignedRE = /-unsigned/;
|
||||||
if (unsignedRE.exec(fileA)) {
|
if (unsignedRE.exec(fileA)) {
|
||||||
@ -101,7 +109,7 @@ function apkSorter (fileA, fileB) {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
var timeDiff = fs.statSync(fileA).mtime - fs.statSync(fileB).mtime;
|
var timeDiff = fs.statSync(fileB).mtime - fs.statSync(fileA).mtime;
|
||||||
return timeDiff === 0 ? fileA.length - fileB.length : timeDiff;
|
return timeDiff === 0 ? fileA.length - fileB.length : timeDiff;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +117,14 @@ function findOutputApksHelper (dir, build_type, arch) {
|
|||||||
var shellSilent = shell.config.silent;
|
var shellSilent = shell.config.silent;
|
||||||
shell.config.silent = true;
|
shell.config.silent = true;
|
||||||
|
|
||||||
var ret = shell.ls(path.join(dir, build_type, '*.apk')).filter(function (candidate) {
|
// list directory recursively
|
||||||
|
var ret = shell.ls('-R', dir).map(function (file) {
|
||||||
|
// ls does not include base directory
|
||||||
|
return path.join(dir, file);
|
||||||
|
}).filter(function (file) {
|
||||||
|
// find all APKs
|
||||||
|
return file.match(/\.apk?$/i);
|
||||||
|
}).filter(function (candidate) {
|
||||||
var apkName = path.basename(candidate);
|
var apkName = path.basename(candidate);
|
||||||
// Need to choose between release and debug .apk.
|
// Need to choose between release and debug .apk.
|
||||||
if (build_type === 'debug') {
|
if (build_type === 'debug') {
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Coho updates this line:
|
// Coho updates this line:
|
||||||
var VERSION = "6.4.0";
|
var VERSION = "6.4.1-dev";
|
||||||
|
|
||||||
module.exports.version = VERSION;
|
module.exports.version = VERSION;
|
||||||
|
|
||||||
|
2
bin/templates/project/assets/www/cordova.js
vendored
@ -19,7 +19,7 @@
|
|||||||
under the License.
|
under the License.
|
||||||
*/
|
*/
|
||||||
;(function() {
|
;(function() {
|
||||||
var PLATFORM_VERSION_BUILD_LABEL = '6.4.0';
|
var PLATFORM_VERSION_BUILD_LABEL = '6.4.1-dev';
|
||||||
// file: src/scripts/require.js
|
// file: src/scripts/require.js
|
||||||
|
|
||||||
/* jshint -W079 */
|
/* jshint -W079 */
|
||||||
|
@ -74,6 +74,10 @@ ext {
|
|||||||
if (!project.hasProperty('cdvBuildMultipleApks')) {
|
if (!project.hasProperty('cdvBuildMultipleApks')) {
|
||||||
cdvBuildMultipleApks = null
|
cdvBuildMultipleApks = null
|
||||||
}
|
}
|
||||||
|
// Whether to append a 0 "abi digit" to versionCode when only a single APK is build
|
||||||
|
if (!project.hasProperty('cdvVersionCodeForceAbiDigit')) {
|
||||||
|
cdvVersionCodeForceAbiDigit = null
|
||||||
|
}
|
||||||
// .properties files to use for release signing.
|
// .properties files to use for release signing.
|
||||||
if (!project.hasProperty('cdvReleaseSigningPropertiesFile')) {
|
if (!project.hasProperty('cdvReleaseSigningPropertiesFile')) {
|
||||||
cdvReleaseSigningPropertiesFile = null
|
cdvReleaseSigningPropertiesFile = null
|
||||||
@ -115,6 +119,7 @@ if (ext.cdvReleaseSigningPropertiesFile == null && file('release-signing.propert
|
|||||||
|
|
||||||
// Cast to appropriate types.
|
// Cast to appropriate types.
|
||||||
ext.cdvBuildMultipleApks = cdvBuildMultipleApks == null ? false : cdvBuildMultipleApks.toBoolean();
|
ext.cdvBuildMultipleApks = cdvBuildMultipleApks == null ? false : cdvBuildMultipleApks.toBoolean();
|
||||||
|
ext.cdvVersionCodeForceAbiDigit = cdvVersionCodeForceAbiDigit == null ? false : cdvVersionCodeForceAbiDigit.toBoolean();
|
||||||
ext.cdvMinSdkVersion = cdvMinSdkVersion == null ? null : Integer.parseInt('' + cdvMinSdkVersion)
|
ext.cdvMinSdkVersion = cdvMinSdkVersion == null ? null : Integer.parseInt('' + cdvMinSdkVersion)
|
||||||
ext.cdvVersionCode = cdvVersionCode == null ? null : Integer.parseInt('' + cdvVersionCode)
|
ext.cdvVersionCode = cdvVersionCode == null ? null : Integer.parseInt('' + cdvVersionCode)
|
||||||
|
|
||||||
@ -142,6 +147,7 @@ task cdvPrintProps << {
|
|||||||
println('cdvCompileSdkVersion=' + cdvCompileSdkVersion)
|
println('cdvCompileSdkVersion=' + cdvCompileSdkVersion)
|
||||||
println('cdvBuildToolsVersion=' + cdvBuildToolsVersion)
|
println('cdvBuildToolsVersion=' + cdvBuildToolsVersion)
|
||||||
println('cdvVersionCode=' + cdvVersionCode)
|
println('cdvVersionCode=' + cdvVersionCode)
|
||||||
|
println('cdvVersionCodeForceAbiDigit=' + cdvVersionCodeForceAbiDigit)
|
||||||
println('cdvMinSdkVersion=' + cdvMinSdkVersion)
|
println('cdvMinSdkVersion=' + cdvMinSdkVersion)
|
||||||
println('cdvBuildMultipleApks=' + cdvBuildMultipleApks)
|
println('cdvBuildMultipleApks=' + cdvBuildMultipleApks)
|
||||||
println('cdvReleaseSigningPropertiesFile=' + cdvReleaseSigningPropertiesFile)
|
println('cdvReleaseSigningPropertiesFile=' + cdvReleaseSigningPropertiesFile)
|
||||||
@ -184,25 +190,45 @@ android {
|
|||||||
buildToolsVersion cdvBuildToolsVersion
|
buildToolsVersion cdvBuildToolsVersion
|
||||||
|
|
||||||
if (Boolean.valueOf(cdvBuildMultipleApks)) {
|
if (Boolean.valueOf(cdvBuildMultipleApks)) {
|
||||||
|
flavorDimensions "default"
|
||||||
|
|
||||||
productFlavors {
|
productFlavors {
|
||||||
|
armeabi {
|
||||||
|
versionCode defaultConfig.versionCode*10 + 1
|
||||||
|
ndk {
|
||||||
|
abiFilters = ["armeabi"]
|
||||||
|
}
|
||||||
|
}
|
||||||
armv7 {
|
armv7 {
|
||||||
versionCode defaultConfig.versionCode*10 + 2
|
versionCode defaultConfig.versionCode*10 + 2
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "armeabi-v7a", ""
|
abiFilters = ["armeabi-v7a"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
arm64 {
|
||||||
|
versionCode defaultConfig.versionCode*10 + 3
|
||||||
|
ndk {
|
||||||
|
abiFilters = ["arm64-v8a"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
x86 {
|
x86 {
|
||||||
versionCode defaultConfig.versionCode*10 + 4
|
versionCode defaultConfig.versionCode*10 + 4
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "x86", ""
|
abiFilters = ["x86"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
all {
|
x86_64 {
|
||||||
|
versionCode defaultConfig.versionCode*10 + 5
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "all", ""
|
abiFilters = ["x86_64"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (Boolean.valueOf(cdvVersionCodeForceAbiDigit)) {
|
||||||
|
// This provides compatibility to the default logic for versionCode before cordova-android 5.2.0
|
||||||
|
defaultConfig {
|
||||||
|
versionCode defaultConfig.versionCode*10
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 213 KiB After Width: | Height: | Size: 63 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 139 KiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 222 KiB |
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 286 KiB |
Before Width: | Height: | Size: 217 KiB After Width: | Height: | Size: 66 KiB |
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 493 KiB After Width: | Height: | Size: 138 KiB |
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 207 KiB |
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 292 KiB |
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 6.3 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 7.7 KiB |
@ -31,7 +31,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.2.3'
|
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
|
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
|
||||||
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
|
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
|
||||||
}
|
}
|
||||||
@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
|
|||||||
apply plugin: 'com.jfrog.bintray'
|
apply plugin: 'com.jfrog.bintray'
|
||||||
|
|
||||||
group = 'org.apache.cordova'
|
group = 'org.apache.cordova'
|
||||||
version = '6.4.0'
|
version = '6.4.1-dev'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion cdvCompileSdkVersion
|
compileSdkVersion cdvCompileSdkVersion
|
||||||
@ -129,9 +129,15 @@ bintray {
|
|||||||
licenses = ['Apache-2.0']
|
licenses = ['Apache-2.0']
|
||||||
labels = ['android', 'cordova', 'phonegap']
|
labels = ['android', 'cordova', 'phonegap']
|
||||||
version {
|
version {
|
||||||
|
<<<<<<< HEAD
|
||||||
name = '6.4.0'
|
name = '6.4.0'
|
||||||
released = new Date()
|
released = new Date()
|
||||||
vcsTag = '6.4.0'
|
vcsTag = '6.4.0'
|
||||||
|
=======
|
||||||
|
name = '6.5.0-dev'
|
||||||
|
released = new Date()
|
||||||
|
vcsTag = '6.5.0-dev'
|
||||||
|
>>>>>>> master
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#Mon Dec 28 10:00:20 PST 2015
|
#Thu Nov 09 10:50:25 PST 2017
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
package org.apache.cordova;
|
package org.apache.cordova;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
|
||||||
import org.apache.cordova.CordovaPlugin;
|
import org.apache.cordova.CordovaPlugin;
|
||||||
@ -51,10 +52,18 @@ public interface CordovaInterface {
|
|||||||
/**
|
/**
|
||||||
* Get the Android activity.
|
* Get the Android activity.
|
||||||
*
|
*
|
||||||
|
* If a custom engine lives outside of the Activity's lifecycle the return value may be null.
|
||||||
|
*
|
||||||
* @return the Activity
|
* @return the Activity
|
||||||
*/
|
*/
|
||||||
public abstract Activity getActivity();
|
public abstract Activity getActivity();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the Android context.
|
||||||
|
*
|
||||||
|
* @return the Context
|
||||||
|
*/
|
||||||
|
public Context getContext();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when a message is sent to plugin.
|
* Called when a message is sent to plugin.
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
package org.apache.cordova;
|
package org.apache.cordova;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
@ -84,6 +85,11 @@ public class CordovaInterfaceImpl implements CordovaInterface {
|
|||||||
return activity;
|
return activity;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Context getContext() {
|
||||||
|
return activity;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object onMessage(String id, Object data) {
|
public Object onMessage(String id, Object data) {
|
||||||
if ("exit".equals(id)) {
|
if ("exit".equals(id)) {
|
||||||
|
@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
|
|||||||
* are not expected to implement it.
|
* are not expected to implement it.
|
||||||
*/
|
*/
|
||||||
public interface CordovaWebView {
|
public interface CordovaWebView {
|
||||||
public static final String CORDOVA_VERSION = "6.4.0";
|
public static final String CORDOVA_VERSION = "6.4.1-dev";
|
||||||
|
|
||||||
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
|
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cordova-android",
|
"name": "cordova-android",
|
||||||
"version": "6.4.0",
|
"version": "6.5.0-dev",
|
||||||
"description": "cordova-android release",
|
"description": "cordova-android release",
|
||||||
"bin": {
|
"bin": {
|
||||||
"create": "bin/create"
|
"create": "bin/create"
|
||||||
|