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/02/04 20:13:30 UTC
android commit: Preparing for 2.4.0
Updated Branches:
refs/heads/master fcc01bc37 -> db099e772
Updated Tags: refs/tags/2.4.0 [created] db099e772
Preparing for 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/db099e77
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/db099e77
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/db099e77
Branch: refs/heads/master
Commit: db099e7722086c23ae3130cef7f4199e98aca3ed
Parents: fcc01bc
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Feb 4 11:12:52 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Feb 4 11:12:52 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 5 +++--
framework/assets/www/index.html | 2 +-
framework/src/org/apache/cordova/Device.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/db099e77/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 3c7011d..197c4d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.0rc2
+2.4.0
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/db099e77/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 ea09464..a6a5ff3 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.4.0rc2.js"></script>
+ <script type="text/javascript" src="cordova-2.4.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/cordova-android/blob/db099e77/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index c0d864d..1eb1ca8 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,8 +1,8 @@
// Platform: android
-// commit e784eee3ce02dbd475e3c3f70031668f1706f2ec
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221
-// File generated at :: Wed Jan 30 2013 09:20:09 GMT-0500 (EST)
+// File generated at :: Mon Feb 04 2013 10:59:03 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -1665,6 +1665,7 @@ module.exports = {
CELL_2G: "2g",
CELL_3G: "3g",
CELL_4G: "4g",
+ CELL:"cellular",
NONE: "none"
};
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/db099e77/framework/assets/www/index.html
----------------------------------------------------------------------
diff --git a/framework/assets/www/index.html b/framework/assets/www/index.html
index 2804a57..ffcaf02 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.4.0rc2.js"></script>
+ <script src="cordova-2.4.0.js"></script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/db099e77/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 628b6dd..883fc55 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.4.0rc2"; // Cordova version
+ public static String cordovaVersion = "2.4.0"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID