Merge branch 'master' into StudioProjectCompat

This commit is contained in:
Joe Bowser
2017-11-07 10:52:37 -08:00
8 changed files with 341 additions and 351 deletions

View File

@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'
group = 'org.apache.cordova'
version = '6.4.0-dev'
version = '6.5.0-dev'
android {
compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
licenses = ['Apache-2.0']
labels = ['android', 'cordova', 'phonegap']
version {
name = '6.4.0-dev'
name = '6.5.0-dev'
released = new Date()
vcsTag = '6.4.0-dev'
vcsTag = '6.5.0-dev'
}
}
}

View File

@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
* are not expected to implement it.
*/
public interface CordovaWebView {
public static final String CORDOVA_VERSION = "6.4.0-dev";
public static final String CORDOVA_VERSION = "6.5.0-dev";
void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);