cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject android commit: Tagging the 2.2.0 release after this commit
Date Wed, 31 Oct 2012 17:58:18 GMT
Updated Branches:
  refs/heads/master bdd5a4e05 -> e55327b06


Tagging the 2.2.0 release after this commit


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/e55327b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/e55327b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/e55327b0

Branch: refs/heads/master
Commit: e55327b0649180e8c99006a7b0021cc6704ba159
Parents: bdd5a4e
Author: Joe Bowser <bowserj@apache.org>
Authored: Wed Oct 31 10:57:57 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Wed Oct 31 10:57:57 2012 -0700

----------------------------------------------------------------------
 VERSION                                      |    2 +-
 bin/templates/project/assets/www/index.html  |    2 +-
 framework/assets/js/cordova.android.js       |    6 +++---
 framework/assets/www/index.html              |    2 +-
 framework/src/org/apache/cordova/Device.java |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e55327b0/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 8b6adce..ccbccc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.0rc2
+2.2.0

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e55327b0/bin/templates/project/assets/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/assets/www/index.html b/bin/templates/project/assets/www/index.html
index f705720..4f8dc5f 100644
--- a/bin/templates/project/assets/www/index.html
+++ b/bin/templates/project/assets/www/index.html
@@ -33,7 +33,7 @@
                 <p class="event received">Device is Ready</p>
             </div>
         </div>
-        <script type="text/javascript" src="cordova-2.2.0rc2.js"></script>
+        <script type="text/javascript" src="cordova-2.2.0.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript">
             app.initialize();

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e55327b0/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index 8dd0ed6..b4aa1fe 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,6 +1,6 @@
-// commit d819e1e60599c12ac831379b06bba9110e9f1790
+// commit 02b91c5313ff37d74a58f71775170afd360f4a1f
 
-// File generated at :: Fri Oct 26 2012 16:03:51 GMT-0400 (EDT)
+// File generated at :: Wed Oct 31 2012 10:40:25 GMT-0700 (PDT)
 
 /*
  Licensed to the Apache Software Foundation (ASF) under one
@@ -2850,7 +2850,7 @@ FileTransfer.prototype.download = function(source, target, successCallback,
erro
         errorCallback(error);
     };
 
-    exec(win, errorCallback, 'FileTransfer', 'download', [source, target, trustAllHosts,
this._id]);
+    exec(win, fail, 'FileTransfer', 'download', [source, target, trustAllHosts, this._id]);
 };
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e55327b0/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 966ca8b..fef25eb 100644
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <title></title>
-    <script src="cordova-2.2.0rc2.js"></script>
+    <script src="cordova-2.2.0.js"></script>
   </head>
   <body>
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e55327b0/framework/src/org/apache/cordova/Device.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Device.java b/framework/src/org/apache/cordova/Device.java
index 16eb785..6a16474 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -39,7 +39,7 @@ import android.telephony.TelephonyManager;
 public class Device extends CordovaPlugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "2.2.0rc2";              // Cordova version
+    public static String cordovaVersion = "2.2.0";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID
 


Mime
View raw message