You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/06/26 01:17:07 UTC

[1/2] android commit: Incrementing versions and updating code

Updated Branches:
  refs/heads/2.9.x 24a0e8956 -> df1536ea7


Incrementing versions and updating code


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

Branch: refs/heads/2.9.x
Commit: 6aff54be764867fb2c8fec51df119632b1e1d7f3
Parents: e01678d
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 25 14:11:30 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Jun 25 14:11:30 2013 -0700

----------------------------------------------------------------------
 VERSION                                      | 2 +-
 framework/assets/www/cordova.js              | 4 ++--
 framework/src/org/apache/cordova/Device.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6aff54be/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 3af205c..c8e38b6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.9.0rc1
+2.9.0

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6aff54be/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index b072c81..873c068 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
 // Platform: android
-// 2.9.0rc1-0-g002f33d
+// 2.9.0-0-g83dc4bd
 /*
  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.9.0rc1-0-g002f33d';
+var CORDOVA_JS_BUILD_LABEL = '2.9.0-0-g83dc4bd';
 // file: lib/scripts/require.js
 
 var require,

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6aff54be/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 79ea04f..66b3393 100644
--- a/framework/src/org/apache/cordova/Device.java
+++ b/framework/src/org/apache/cordova/Device.java
@@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
 public class Device extends CordovaPlugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "2.9.0rc1";              // Cordova version
+    public static String cordovaVersion = "2.9.0";              // Cordova version
     public static String platform = "Android";                  // Device OS
     public static String uuid;                                  // Device UUID
 


[2/2] android commit: Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.9.x

Posted by bo...@apache.org.
Merge branch '2.9.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.9.x


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

Branch: refs/heads/2.9.x
Commit: df1536ea77e97b7d362a19582f8beddd168c5ec3
Parents: 6aff54b 24a0e89
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 25 14:12:41 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Jun 25 14:12:41 2013 -0700

----------------------------------------------------------------------
 bin/templates/cordova/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------