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/01/03 02:08:41 UTC
android commit: Incrementing version to 2.3.0 final
Updated Branches:
refs/heads/master 6efeb1471 -> 7c069f14f
Updated Tags: refs/tags/2.3.0 [created] 7c069f14f
Incrementing version to 2.3.0 final
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7c069f14
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7c069f14
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7c069f14
Branch: refs/heads/master
Commit: 7c069f14f875117e7ee00f2ad04ec3ea9295a472
Parents: 6efeb14
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jan 2 17:07:21 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Jan 2 17:07:21 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/assets/www/index.html | 2 +-
framework/assets/js/cordova.android.js | 8 ++++----
framework/src/org/apache/cordova/Device.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7c069f14/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index bcf7441..276cbf9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.0rc2
+2.3.0
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7c069f14/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 3b97d3a..92b61be 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.3.0rc2.js"></script>
+ <script type="text/javascript" src="cordova-2.3.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/7c069f14/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index f38c20f..42b6aa6 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,6 +1,6 @@
-// commit 4301bc92e237b59d5515bd7758ab289e454168cb
+// commit 4082ee0ba3a8902cba7bd087d0584bb7534e694b
-// File generated at :: Mon Dec 10 2012 14:13:09 GMT-0800 (PST)
+// File generated at :: Wed Jan 02 2013 16:43:38 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -6420,12 +6420,12 @@ window.cordova = require('cordova');
// Drop the common globals into the window object, but be nice and don't overwrite anything.
builder.buildIntoButDoNotClobber(base.defaults, context);
- builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoAndClobber(base.clobbers, context);
+ builder.buildIntoAndMerge(base.merges, context);
builder.buildIntoButDoNotClobber(platform.defaults, context);
- builder.buildIntoAndMerge(platform.merges, context);
builder.buildIntoAndClobber(platform.clobbers, context);
+ builder.buildIntoAndMerge(platform.merges, context);
// Call the platform-specific initialization
platform.initialize();
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7c069f14/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 0b39a14..d9a0200 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.3.0rc2"; // Cordova version
+ public static String cordovaVersion = "2.3.0"; // Cordova version
public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID