Incrementing version to 3.0.0, ready for tagging

gg12 · Jul 19, 2013 · d0b3f41 · d0b3f41
1 parent d91ac45
commit d0b3f41
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.0rc1
+3.0.0
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-echo "3.0.0rc1"
+echo "3.0.0"
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 3.0.0rc1-0-g1965a39
+// 3.0.0-0-ge670de9
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.0.0rc1-0-g1965a39';
+var CORDOVA_JS_BUILD_LABEL = '3.0.0-0-ge670de9';
 // file: lib/scripts/require.js
 
 var require,
@@ -1786,7 +1786,7 @@ function handlePluginsObject(path, moduleList) {
     var scriptCounter = moduleList.length;
 
     if (!scriptCounter) {
-        onScriptLoadingComplete();
+        finishPluginLoading();
         return;
     }
     function scriptLoadedCallback() {

diff --git a/test/assets/www/cordova.js b/test/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 2.7.0rc1-169-g87cc336
+// 3.0.0-0-ge670de9
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-169-g87cc336';
+var CORDOVA_JS_BUILD_LABEL = '3.0.0-0-ge670de9';
 // file: lib/scripts/require.js
 
 var require,
@@ -900,7 +900,7 @@ function androidExec(success, fail, service, action, args) {
     // Process any ArrayBuffers in the args into a string.
     for (var i = 0; i < args.length; i++) {
         if (utils.typeName(args[i]) == 'ArrayBuffer') {
-            args[i] = utils.encodeBase64(args[i]);
+            args[i] = base64.fromArrayBuffer(args[i]);
         }
     }
 
@@ -1784,6 +1784,11 @@ function finishPluginLoading() {
 function handlePluginsObject(path, moduleList) {
     // Now inject the scripts.
     var scriptCounter = moduleList.length;
+
+    if (!scriptCounter) {
+        finishPluginLoading();
+        return;
+    }
     function scriptLoadedCallback() {
         if (!--scriptCounter) {
             onScriptLoadingComplete(moduleList);