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:43 UTC

[1/3] android commit: Set VERSION to 3.4.0-dev (via coho)

Updated Branches:
  refs/heads/master e3430a916 -> 642bd10dc


Set VERSION to 3.4.0-dev (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/dbbe0389
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/dbbe0389
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/dbbe0389

Branch: refs/heads/master
Commit: dbbe03893976ab7d925d3096c938d1695ee0ee7b
Parents: e3430a9
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 3 15:44:21 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 3 15:44:21 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/dbbe0389/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 6d7d659..688932a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev
+3.4.0-dev

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dbbe0389/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index 624e3d8..61b62e6 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.4.0-dev";
 
 console.log(VERSION);

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dbbe0389/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..8b0bb19 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.4.0-dev";
 
     private ArrayList<Integer> keyDownCodes = new ArrayList<Integer>();
     private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();


[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/642bd10d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/642bd10d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/642bd10d

Branch: refs/heads/master
Commit: 642bd10dcc92b23c53b14da3c53b1b8b9daead20
Parents: 7c566c3
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:38 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/642bd10d/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: Update JS snapshot to version 3.4.0-dev (via coho)

Posted by bo...@apache.org.
Update JS snapshot to version 3.4.0-dev (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/7c566c36
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7c566c36
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7c566c36

Branch: refs/heads/master
Commit: 7c566c36f4018f02b13ef9f5f7719e2bbf8b8d4b
Parents: dbbe038
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Dec 3 15:44:23 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Dec 3 15:44:23 2013 -0800

----------------------------------------------------------------------
 framework/assets/www/cordova.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7c566c36/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 15db4b2..f3778f5 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-dev-c9de1bc
 /*
  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-dev-c9de1bc';
 // file: lib/scripts/require.js
 
 /*jshint -W079 */