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/12/04 01:25:51 UTC
[1/3] android commit: Update JS snapshot to version 3.3.0-rc1 (via
coho)
Updated Branches:
refs/heads/3.3.x [created] fe450e357
Update JS snapshot to version 3.3.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/1c710f84
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/1c710f84
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/1c710f84
Branch: refs/heads/3.3.x
Commit: 1c710f84598b4e2d210653aa18c227d6d48e37f9
Parents: e3430a9
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 3 15:44:19 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 3 15:44:19 2013 -0800
----------------------------------------------------------------------
framework/assets/www/cordova.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/1c710f84/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 15db4b2..4a4a4df 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.3.0-dev-aac4947
+// 3.3.0-rc1
/*
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.3.0-dev-aac4947';
+var CORDOVA_JS_BUILD_LABEL = '3.3.0-rc1';
// file: lib/scripts/require.js
/*jshint -W079 */
@@ -552,7 +552,7 @@ function include(parent, objects, clobber, merge) {
include(result, obj.children, clobber, merge);
}
} catch(e) {
- utils.alert('Exception building cordova JS globals: ' + e + ' for key "' + key + '"');
+ utils.alert('Exception building Cordova JS globals: ' + e + ' for key "' + key + '"');
}
});
}
[3/3] android commit: Forgot Apache Headers on MessageTest
Posted by bo...@apache.org.
Forgot Apache Headers on MessageTest
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fe450e35
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fe450e35
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fe450e35
Branch: refs/heads/3.3.x
Commit: fe450e357cb89d17c06799c915ba0d1054cb9340
Parents: 214934c
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 3 15:52:25 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 3 15:52:25 2013 -0800
----------------------------------------------------------------------
.../apache/cordova/test/junit/MessageTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fe450e35/test/src/org/apache/cordova/test/junit/MessageTest.java
----------------------------------------------------------------------
diff --git a/test/src/org/apache/cordova/test/junit/MessageTest.java b/test/src/org/apache/cordova/test/junit/MessageTest.java
index 0f048ea..4d0ce16 100644
--- a/test/src/org/apache/cordova/test/junit/MessageTest.java
+++ b/test/src/org/apache/cordova/test/junit/MessageTest.java
@@ -1,3 +1,21 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
package org.apache.cordova.test.junit;
import org.apache.cordova.CordovaPlugin;
[2/3] android commit: Set VERSION to 3.3.0-rc1 (via coho)
Posted by bo...@apache.org.
Set VERSION to 3.3.0-rc1 (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/214934cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/214934cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/214934cc
Branch: refs/heads/3.3.x
Commit: 214934cc032f765e14bfd54a690cf40f511b7906
Parents: 1c710f8
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 3 15:44:20 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 3 15:44:20 2013 -0800
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/src/org/apache/cordova/CordovaWebView.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/214934cc/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 6d7d659..490631a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev
+3.3.0-rc1
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/214934cc/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 624e3d8..bd92590 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -20,6 +20,6 @@
*/
// Coho updates this line:
-var VERSION = "3.3.0-dev";
+var VERSION = "3.3.0-rc1";
console.log(VERSION);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/214934cc/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 9780493..0c38160 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -68,7 +68,7 @@ import android.widget.FrameLayout;
public class CordovaWebView extends WebView {
public static final String TAG = "CordovaWebView";
- public static final String CORDOVA_VERSION = "3.3.0-dev";
+ public static final String CORDOVA_VERSION = "3.3.0-rc1";
private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();