Cordova Android 6.2.1

config.xml

@@ -16,30 +16,16 @@
     <allow-intent href="sms:*" />
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
-    <preference name="Fullscreen" value="false" />   
-    <preference name="SplashScreenDelay" value="2000" /> 
+    <preference name="Fullscreen" value="false" />
+    <preference name="SplashScreenDelay" value="2000" />
     <preference name="SplashScreen" value="screen"/>
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="ShowSplashScreenSpinner" value="false" />
-    <platform name="android">    
+    <platform name="android">
         <icon src="www/assets/mipmap-ldpi/ic_launcher.png" density="ldpi" />
         <icon src="www/assets/mipmap-mdpi/ic_launcher.png" density="mdpi" />
-        <icon src="www/assets/mipmap-hdpi/ic_launcher.png" density="hdpi" />        
-        <icon src="www/assets/mipmap-xhdpi/ic_launcher.png" density="xdpi" />
-        <icon src="www/assets/mipmap-xxhdpi/ic_launcher.png" density="xxdpi" />
-        <icon src="www/assets/mipmap-xxxhdpi/ic_launcher.png" density="xxxdpi" />                
-        <splash src="res/drawable-land-ldpi/screen.png" density="land-ldpi"/>
-        <splash src="res/drawable-land-mdpi/screen.png" density="land-mdpi"/>
-        <splash src="res/drawable-land-hdpi/screen.png" density="land-hdpi"/>
-        <splash src="res/drawable-land-xhdpi/screen.png" density="land-xhdpi"/>
-        <splash src="res/drawable-land-xhdpi/screen.png" density="land-xxhdpi"/>
-        <splash src="res/drawable-land-xhdpi/screen.png" density="land-xxxhdpi"/>
-        <splash src="res/drawable-port-ldpi/screen.png" density="port-ldpi"/>
-        <splash src="res/drawable-port-mdpi/screen.png" density="port-mdpi"/>
-        <splash src="res/drawable-port-hdpi/screen.png" density="port-hdpi"/>
-        <splash src="res/drawable-port-xhdpi/screen.png" density="port-xhdpi"/>
-        <splash src="res/drawable-port-xhdpi/screen.png" density="port-xxhdpi"/>
-        <splash src="res/drawable-port-xhdpi/screen.png" density="port-xxxhdpi"/>
+        <icon src="www/assets/mipmap-hdpi/ic_launcher.png" density="hdpi" />
+        <icon src="www/assets/mipmap-xhdpi/ic_launcher.png" density="xhdpi" />
         <allow-intent href="market:*" />
-    </platform>    
+    </platform>
 </widget>

platforms/android/AndroidManifest.xml

@@ -12,7 +12,7 @@
         <activity android:clearTaskOnLaunch="true" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false" android:name="com.google.zxing.client.android.CaptureActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:windowSoftInputMode="stateAlwaysHidden" />
         <activity android:label="Share" android:name="com.google.zxing.client.android.encode.EncodeActivity" />
     </application>
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
     <uses-feature android:name="android.hardware.camera" android:required="true" />

platforms/android/CordovaLib/build.gradle

@@ -16,26 +16,31 @@
    under the License.
 */
 
-
+ext {
+    apply from: 'cordova.gradle'
+    cdvCompileSdkVersion = privateHelpers.getProjectTarget()
+    cdvBuildToolsVersion = privateHelpers.findLatestInstalledBuildTools()
+}
 
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
-
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
 
-ext {
-    apply from: 'cordova.gradle'
-    cdvCompileSdkVersion = privateHelpers.getProjectTarget()
-    cdvBuildToolsVersion = privateHelpers.findLatestInstalledBuildTools()
-}
+group = 'org.apache.cordova'
+version = '6.2.0'
 
 android {
     compileSdkVersion cdvCompileSdkVersion
@@ -58,4 +63,73 @@ android {
             assets.srcDirs = ['assets']
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/NOTICE'
+    }
+}
+
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+                name 'Cordova'
+                url 'https://cordova.apache.org'
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'stevengill'
+                        name 'Steve Gill'
+                    }
+                }
+                scm {
+                    connection 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
+                    developerConnection 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
+                    url 'https://git-wip-us.apache.org/repos/asf?p=cordova-android'
+
+                }
+            }
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+artifacts {
+    archives sourcesJar
+}
+
+bintray {
+    user = System.getenv('BINTRAY_USER')
+    key = System.getenv('BINTRAY_KEY')
+    configurations = ['archives']
+    pkg {
+        repo = 'maven'
+        name = 'cordova-android'
+        userOrg = 'cordova'
+        licenses = ['Apache-2.0']
+        vcsUrl = 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git'
+        websiteUrl = 'https://cordova.apache.org'
+        issueTrackerUrl = 'https://issues.apache.org/jira/browse/CB'
+        publicDownloadNumbers = true
+        licenses = ['Apache-2.0']
+        labels = ['android', 'cordova', 'phonegap']
+        version {
+            name = version
+            released  = new Date()
+            vcsTag = version
+        }
+    }
 }

platforms/android/CordovaLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Sun Mar 19 18:35:45 CET 2017
+#Sun Apr 23 15:43:32 CEST 2017

platforms/android/CordovaLib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1 +1 @@
-#Sun Mar 19 18:35:46 CET 2017
+#Sun Apr 23 15:43:32 CEST 2017

platforms/android/CordovaLib/project.properties

@@ -10,7 +10,7 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-24
+target=android-25
 apk-configurations=
 renderscript.opt.level=O0
 android.library=true

platforms/android/CordovaLib/src/org/apache/cordova/CordovaWebView.java

@@ -31,7 +31,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  * are not expected to implement it.
  */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "6.0.0";
+    public static final String CORDOVA_VERSION = "6.2.1";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);
 

platforms/android/CordovaLib/src/org/apache/cordova/NativeToJsMessageQueue.java

@@ -488,36 +488,51 @@ void encodeAsMessage(StringBuilder sb) {
             encodeAsMessageHelper(sb, pluginResult);
         }
 
+        void buildJsMessage(StringBuilder sb) {
+            switch (pluginResult.getMessageType()) {
+                case PluginResult.MESSAGE_TYPE_MULTIPART:
+                    int size = pluginResult.getMultipartMessagesSize();
+                    for (int i=0; i<size; i++) {
+                        PluginResult subresult = pluginResult.getMultipartMessage(i);
+                        JsMessage submessage = new JsMessage(subresult, jsPayloadOrCallbackId);
+                        submessage.buildJsMessage(sb);
+                        if (i < (size-1)) {
+                            sb.append(",");
+                        }
+                    }
+                    break;
+                case PluginResult.MESSAGE_TYPE_BINARYSTRING:
+                    sb.append("atob('")
+                            .append(pluginResult.getMessage())
+                            .append("')");
+                    break;
+                case PluginResult.MESSAGE_TYPE_ARRAYBUFFER:
+                    sb.append("cordova.require('cordova/base64').toArrayBuffer('")
+                            .append(pluginResult.getMessage())
+                            .append("')");
+                    break;
+                default:
+                    sb.append(pluginResult.getMessage());
+            }
+        }
+
         void encodeAsJsMessage(StringBuilder sb) {
             if (pluginResult == null) {
                 sb.append(jsPayloadOrCallbackId);
             } else {
                 int status = pluginResult.getStatus();
                 boolean success = (status == PluginResult.Status.OK.ordinal()) || (status == PluginResult.Status.NO_RESULT.ordinal());
                 sb.append("cordova.callbackFromNative('")
-                  .append(jsPayloadOrCallbackId)
-                  .append("',")
-                  .append(success)
-                  .append(",")
-                  .append(status)
-                  .append(",[");
-                switch (pluginResult.getMessageType()) {
-                    case PluginResult.MESSAGE_TYPE_BINARYSTRING:
-                        sb.append("atob('")
-                          .append(pluginResult.getMessage())
-                          .append("')");
-                        break;
-                    case PluginResult.MESSAGE_TYPE_ARRAYBUFFER:
-                        sb.append("cordova.require('cordova/base64').toArrayBuffer('")
-                          .append(pluginResult.getMessage())
-                          .append("')");
-                        break;
-                    default:
-                    sb.append(pluginResult.getMessage());
-                }
+                        .append(jsPayloadOrCallbackId)
+                        .append("',")
+                        .append(success)
+                        .append(",")
+                        .append(status)
+                        .append(",[");
+                buildJsMessage(sb);
                 sb.append("],")
-                  .append(pluginResult.getKeepCallback())
-                  .append(");");
+                        .append(pluginResult.getKeepCallback())
+                        .append(");");
             }
         }
     }

platforms/android/android.json

@@ -9,11 +9,11 @@
                 "parents": {
                     "/*": [
                         {
-                            "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
                             "count": 1
                         },
                         {
-                            "xml": "<feature name=\"SplashScreen\"><param name=\"android-package\" value=\"org.apache.cordova.splashscreen.SplashScreen\" /><param name=\"onload\" value=\"true\" /></feature>",
+                            "xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
                             "count": 1
                         },
                         {
@@ -25,28 +25,27 @@
             },
             "AndroidManifest.xml": {
                 "parents": {
-                    "/manifest": [
-                        {
-                            "xml": "<uses-permission android:name=\"android.permission.CAMERA\" />",
-                            "count": 1
-                        },
+                    "/manifest/application": [
                         {
-                            "xml": "<uses-permission android:name=\"android.permission.FLASHLIGHT\" />",
+                            "xml": "<activity android:clearTaskOnLaunch=\"true\" android:configChanges=\"orientation|keyboardHidden|screenSize\" android:exported=\"false\" android:name=\"com.google.zxing.client.android.CaptureActivity\" android:theme=\"@android:style/Theme.NoTitleBar.Fullscreen\" android:windowSoftInputMode=\"stateAlwaysHidden\" />",
                             "count": 1
                         },
                         {
-                            "xml": "<uses-feature android:name=\"android.hardware.camera\" android:required=\"true\" />",
+                            "xml": "<activity android:label=\"Share\" android:name=\"com.google.zxing.client.android.encode.EncodeActivity\" />",
                             "count": 1
                         }
                     ],
-                    "/*": [],
-                    "/manifest/application": [
+                    "/manifest": [
                         {
-                            "xml": "<activity android:clearTaskOnLaunch=\"true\" android:configChanges=\"orientation|keyboardHidden|screenSize\" android:exported=\"false\" android:name=\"com.google.zxing.client.android.CaptureActivity\" android:theme=\"@android:style/Theme.NoTitleBar.Fullscreen\" android:windowSoftInputMode=\"stateAlwaysHidden\" />",
+                            "xml": "<uses-permission android:name=\"android.permission.CAMERA\" />",
                             "count": 1
                         },
                         {
-                            "xml": "<activity android:label=\"Share\" android:name=\"com.google.zxing.client.android.encode.EncodeActivity\" />",
+                            "xml": "<uses-permission android:name=\"android.permission.FLASHLIGHT\" />",
+                            "count": 1
+                        },
+                        {
+                            "xml": "<uses-feature android:name=\"android.hardware.camera\" android:required=\"true\" />",
                             "count": 1
                         }
                     ]
@@ -55,13 +54,13 @@
         }
     },
     "installed_plugins": {
-        "cordova-plugin-whitelist": {
-            "PACKAGE_NAME": "io.cordova.hellocordova"
+        "cordova-plugin-compat": {
+            "PACKAGE_NAME": "friimaind.piholedroid"
         },
         "cordova-plugin-splashscreen": {
             "PACKAGE_NAME": "friimaind.piholedroid"
         },
-        "cordova-plugin-compat": {
+        "cordova-plugin-whitelist": {
             "PACKAGE_NAME": "friimaind.piholedroid"
         },
         "phonegap-plugin-barcodescanner": {
@@ -88,9 +87,9 @@
         }
     ],
     "plugin_metadata": {
-        "cordova-plugin-whitelist": "1.3.1",
-        "cordova-plugin-splashscreen": "4.0.1",
         "cordova-plugin-compat": "1.1.0",
+        "cordova-plugin-splashscreen": "4.0.1",
+        "cordova-plugin-whitelist": "1.3.1",
         "phonegap-plugin-barcodescanner": "6.0.6"
     }
 }

platforms/android/build.gradle

@@ -30,7 +30,7 @@ buildscript {
     // http://tools.android.com/tech-docs/new-build-system/version-compatibility
     // and https://issues.apache.org/jira/browse/CB-8143
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -267,7 +267,7 @@ def promptForReleaseKeyPassword() {
 
 gradle.taskGraph.whenReady { taskGraph ->
     taskGraph.getAllTasks().each() { task ->
-        if (task.name == 'validateReleaseSigning') {
+        if (task.name == 'validateReleaseSigning' || task.name == 'validateSigningRelease') {
             promptForReleaseKeyPassword()
         }
     }