You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/05/05 18:10:21 UTC

[1/9] git commit: CB-5980 Incremented plugin version on dev branch.

Repository: cordova-plugin-device
Updated Branches:
  refs/heads/cdvtest 7df1e2797 -> 7fe5e5e76


CB-5980 Incremented plugin version on dev branch.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/9a2ae7d2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/9a2ae7d2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/9a2ae7d2

Branch: refs/heads/cdvtest
Commit: 9a2ae7d2ee5549a159e8cd3d3def31d144b8b32b
Parents: d7b0855
Author: Steven Gill <st...@gmail.com>
Authored: Wed Feb 5 18:13:30 2014 -0800
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Feb 5 18:13:30 2014 -0800

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/9a2ae7d2/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index a0472be..d1efe8d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,7 +4,7 @@
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="org.apache.cordova.device"
-    version="0.2.8">
+    version="0.2.9-dev">
     <name>Device</name>
     <description>Cordova Device Plugin</description>
     <license>Apache 2.0</license>


[9/9] git commit: Merge branch 'master' into cdvtest

Posted by mm...@apache.org.
Merge branch 'master' into cdvtest


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/7fe5e5e7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/7fe5e5e7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/7fe5e5e7

Branch: refs/heads/cdvtest
Commit: 7fe5e5e7695202ba5c416704d5e05527c5d01592
Parents: 7df1e27 a9944dc
Author: Michal Mocny <mm...@gmail.com>
Authored: Mon May 5 12:10:12 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Mon May 5 12:10:12 2014 -0400

----------------------------------------------------------------------
 CONTRIBUTING.md             | 16 ++++++++++++++++
 NOTICE                      |  5 +++++
 RELEASENOTES.md             |  6 ++++++
 plugin.xml                  | 20 +++++++++++++++++++-
 src/android/Device.java     | 11 -----------
 src/blackberry10/index.js   |  3 +--
 src/windows8/DeviceProxy.js |  4 ++--
 src/wp/Device.cs            | 14 +-------------
 8 files changed, 50 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/7fe5e5e7/plugin.xml
----------------------------------------------------------------------


[4/9] git commit: CB-6422 [windows8] use cordova/exec/proxy

Posted by mm...@apache.org.
CB-6422 [windows8] use cordova/exec/proxy


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

Branch: refs/heads/cdvtest
Commit: 6bebb48968464ca07bf2218d83e73ffe20c4d078
Parents: 90f1156
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Tue Apr 8 16:04:47 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Tue Apr 8 16:04:47 2014 -0700

----------------------------------------------------------------------
 src/windows8/DeviceProxy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/6bebb489/src/windows8/DeviceProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/DeviceProxy.js b/src/windows8/DeviceProxy.js
index 1567d28..3a2aed3 100644
--- a/src/windows8/DeviceProxy.js
+++ b/src/windows8/DeviceProxy.js
@@ -46,5 +46,5 @@ module.exports = {
 
 };
 
-require("cordova/windows8/commandProxy").add("Device", module.exports);
+require("cordova/exec/proxy").add("Device", module.exports);
 


[2/9] git commit: Add NOTICE file

Posted by mm...@apache.org.
Add NOTICE file


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

Branch: refs/heads/cdvtest
Commit: 216210594c52d923fa32ca26b8edc418fd679dbb
Parents: 9a2ae7d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Feb 27 15:36:31 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Feb 27 15:36:31 2014 -0500

----------------------------------------------------------------------
 NOTICE | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/21621059/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..8ec56a5
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Cordova
+Copyright 2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).


[3/9] git commit: CB-5105 Removed dead code for device.version

Posted by mm...@apache.org.
CB-5105 Removed dead code for device.version

Dead code has been removed from the native side for the following
platforms:

-Android
-WP8
-BB10
-Windows 8
Every variable, method or argument related with retrieve the cordova
version from the native side has been removed. Given the fact that
cordova.js, it's providing the cordova.version.

The plugin has been tested under each platform involved with the
expected results, everything settled to be added to the repository.

github: close #13


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/90f11561
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/90f11561
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/90f11561

Branch: refs/heads/cdvtest
Commit: 90f115618a58ad942c5c97ae5534b6563cf38212
Parents: 2162105
Author: martincgg <ma...@gmail.com>
Authored: Mon Mar 3 12:28:01 2014 -0600
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Mar 3 14:11:34 2014 -0500

----------------------------------------------------------------------
 src/android/Device.java     | 11 -----------
 src/blackberry10/index.js   |  3 +--
 src/windows8/DeviceProxy.js |  2 +-
 src/wp/Device.cs            | 14 +-------------
 4 files changed, 3 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/90f11561/src/android/Device.java
----------------------------------------------------------------------
diff --git a/src/android/Device.java b/src/android/Device.java
index 6aef460..ad9002b 100644
--- a/src/android/Device.java
+++ b/src/android/Device.java
@@ -33,7 +33,6 @@ import android.provider.Settings;
 public class Device extends CordovaPlugin {
     public static final String TAG = "Device";
 
-    public static String cordovaVersion = "dev";              // Cordova version
     public static String platform;                            // Device OS
     public static String uuid;                                // Device UUID
 
@@ -73,7 +72,6 @@ public class Device extends CordovaPlugin {
             r.put("uuid", Device.uuid);
             r.put("version", this.getOSVersion());
             r.put("platform", this.getPlatform());
-            r.put("cordova", Device.cordovaVersion);
             r.put("model", this.getModel());
             callbackContext.success(r);
         }
@@ -112,15 +110,6 @@ public class Device extends CordovaPlugin {
         return uuid;
     }
 
-    /**
-     * Get the Cordova version.
-     *
-     * @return
-     */
-    public String getCordovaVersion() {
-        return Device.cordovaVersion;
-    }
-
     public String getModel() {
         String model = android.os.Build.MODEL;
         return model;

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/90f11561/src/blackberry10/index.js
----------------------------------------------------------------------
diff --git a/src/blackberry10/index.js b/src/blackberry10/index.js
index 639ac64..4d09492 100644
--- a/src/blackberry10/index.js
+++ b/src/blackberry10/index.js
@@ -60,8 +60,7 @@ module.exports = {
                 platform: "blackberry10",
                 version: window.qnx.webplatform.device.scmBundle,
                 model: modelName,
-                uuid: uuid,
-                cordova: "dev"
+                uuid: uuid
             };
 
         result.ok(info);

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/90f11561/src/windows8/DeviceProxy.js
----------------------------------------------------------------------
diff --git a/src/windows8/DeviceProxy.js b/src/windows8/DeviceProxy.js
index 16145c0..1567d28 100644
--- a/src/windows8/DeviceProxy.js
+++ b/src/windows8/DeviceProxy.js
@@ -40,7 +40,7 @@ module.exports = {
         }
 
         setTimeout(function () {
-            win({ platform: "windows8", version: "8", uuid: deviceId, cordova: '0.0.0', model: window.clientInformation.platform });
+            win({ platform: "windows8", version: "8", uuid: deviceId, model: window.clientInformation.platform });
         }, 0);
     }
 

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/90f11561/src/wp/Device.cs
----------------------------------------------------------------------
diff --git a/src/wp/Device.cs b/src/wp/Device.cs
index 0d2576d..b8a8045 100644
--- a/src/wp/Device.cs
+++ b/src/wp/Device.cs
@@ -35,16 +35,13 @@ namespace WPCordovaClassLib.Cordova.Commands
         public void getDeviceInfo(string notused)
         {
 
-            string res = String.Format("\"name\":\"{0}\",\"cordova\":\"{1}\",\"platform\":\"{2}\",\"uuid\":\"{3}\",\"version\":\"{4}\",\"model\":\"{5}\"",
+            string res = String.Format("\"name\":\"{0}\",\"platform\":\"{1}\",\"uuid\":\"{2}\",\"version\":\"{3}\",\"model\":\"{4}\"",
                                         this.name,
-                                        this.cordova,
                                         this.platform,
                                         this.uuid,
                                         this.version,
                                         this.model);
 
-
-
             res = "{" + res + "}";
             //Debug.WriteLine("Result::" + res);
             DispatchCommandResult(new PluginResult(PluginResult.Status.OK, res));
@@ -68,15 +65,6 @@ namespace WPCordovaClassLib.Cordova.Commands
             }
         }
 
-        public string cordova
-        {
-            get
-            {
-                // TODO: should be able to dynamically read the Cordova version from somewhere...
-                return "3.0.0";
-            }
-        }
-
         public string platform
         {
             get


[7/9] git commit: CB-6452 Incremented plugin version on dev branch.

Posted by mm...@apache.org.
CB-6452 Incremented plugin version on dev branch.


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

Branch: refs/heads/cdvtest
Commit: db2c4f6cdd10f69287da068635bd40992532d4ea
Parents: 4ae85e8
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 11:16:03 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 11:16:03 2014 -0400

----------------------------------------------------------------------
 plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/db2c4f6c/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index e618c7a..8a011bf 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -22,7 +22,7 @@
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="org.apache.cordova.device"
-    version="0.2.9">
+    version="0.2.10-dev">
     <name>Device</name>
     <description>Cordova Device Plugin</description>
     <license>Apache 2.0</license>


[6/9] git commit: CB-6452 Updated version and RELEASENOTES.md for release 0.2.9

Posted by mm...@apache.org.
CB-6452 Updated version and RELEASENOTES.md for release 0.2.9


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/4ae85e85
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/4ae85e85
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/4ae85e85

Branch: refs/heads/cdvtest
Commit: 4ae85e854d8d2741ac3cc44a6ac127d863ec73c4
Parents: 4304d36
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Apr 17 10:53:20 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Apr 17 10:53:20 2014 -0400

----------------------------------------------------------------------
 RELEASENOTES.md | 6 ++++++
 plugin.xml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/4ae85e85/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a2f41dd..2df6b39 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -55,3 +55,9 @@
 
 ### 0.2.8 (Feb 05, 2014)
 * Tizen support added
+
+### 0.2.9 (Apr 17, 2014)
+* CB-5105: [Android, windows8, WP, BlackBerry10] Removed dead code for device.version
+* CB-6422: [windows8] use cordova/exec/proxy
+* CB-6460: Update license headers
+* Add NOTICE file

http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/4ae85e85/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 6955df7..e618c7a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -22,7 +22,7 @@
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="org.apache.cordova.device"
-    version="0.2.9-dev">
+    version="0.2.9">
     <name>Device</name>
     <description>Cordova Device Plugin</description>
     <license>Apache 2.0</license>


[5/9] git commit: CB-6460: Update license headers

Posted by mm...@apache.org.
CB-6460: Update license headers


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/4304d365
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/4304d365
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/4304d365

Branch: refs/heads/cdvtest
Commit: 4304d365a8393811ba03f027ded2496cc5f908ca
Parents: 6bebb48
Author: Ian Clelland <ic...@chromium.org>
Authored: Wed Apr 16 16:16:03 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Wed Apr 16 16:16:03 2014 -0400

----------------------------------------------------------------------
 plugin.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/4304d365/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index d1efe8d..6955df7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:rim="http://www.blackberry.com/ns/widgets"


[8/9] git commit: CB-6491 add CONTRIBUTING.md

Posted by mm...@apache.org.
CB-6491 add CONTRIBUTING.md


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

Branch: refs/heads/cdvtest
Commit: a9944dca5c58ba78e0014b60d5b4d59ad8ce0448
Parents: db2c4f6
Author: Marcel Kinard <cm...@gmail.com>
Authored: Wed Apr 30 09:24:45 2014 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Wed Apr 30 09:24:45 2014 -0400

----------------------------------------------------------------------
 CONTRIBUTING.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/a9944dca/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..1594d12
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,16 @@
+# Contributing to Apache Cordova
+
+Anyone can contribute to Cordova. And we need your contributions.
+
+There are multiple ways to contribute: report bugs, improve the docs, and
+contribute code.
+
+For instructions on this, start with the 
+[contribution overview](http://cordova.apache.org/#contribute).
+
+The details are explained there, but the important items are:
+ - Sign and submit an Apache ICLA (Contributor License Agreement).
+ - Have a Jira issue open that corresponds to your contribution.
+ - Run the tests so your patch doesn't break existing functionality.
+
+We look forward to your contributions!