You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2017/04/27 20:02:09 UTC

[02/10] cordova-plugin-media git commit: Set VERSION to 3.0.1-dev (via coho)

Set VERSION to 3.0.1-dev (via coho)


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

Branch: refs/heads/3.0.x
Commit: 8c2de08152a7a8fb896bbb0a782abec730241bcb
Parents: a66cf93
Author: Steve Gill <st...@gmail.com>
Authored: Tue Feb 28 17:56:00 2017 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Mar 2 14:52:44 2017 -0800

----------------------------------------------------------------------
 package.json     |   2 +-
 plugin.xml       | 323 ++++++++++++++++++++++++++++++--------------------
 tests/plugin.xml |  34 +++++-
 3 files changed, 222 insertions(+), 137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/8c2de081/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 6769e68..a8717f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-media",
-  "version": "3.0.0",
+  "version": "3.0.1-dev",
   "description": "Cordova Media Plugin",
   "types": "./types/index.d.ts",
   "cordova": {

http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/8c2de081/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 100d7f1..04a3d5d 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,134 +1,195 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-media" version="3.0.0">
-  <name>Media</name>
-  <description>Cordova Media Plugin</description>
-  <license>Apache 2.0</license>
-  <keywords>cordova,media</keywords>
-  <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git</repo>
-  <issue>https://issues.apache.org/jira/browse/CB/component/12320647</issue>
-  <engines>
-    <engine name="cordova-android" version=">=6.1.0"/>
-  </engines>
-  <dependency id="cordova-plugin-file" version="^4.0.0"/>
-  <dependency id="cordova-plugin-compat" version="^1.0.0"/>
-  <js-module src="www/MediaError.js" name="MediaError">
-    <clobbers target="window.MediaError"/>
-  </js-module>
-  <js-module src="www/Media.js" name="Media">
-    <clobbers target="window.Media"/>
-  </js-module>
-  <platform name="android">
-    <config-file target="res/xml/config.xml" parent="/*">
-      <feature name="Media">
-        <param name="android-package" value="org.apache.cordova.media.AudioHandler"/>
-      </feature>
-    </config-file>
-    <config-file target="AndroidManifest.xml" parent="/*">
-      <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-      <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-      <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-      <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    </config-file>
-    <source-file src="src/android/AudioHandler.java" target-dir="src/org/apache/cordova/media"/>
-    <source-file src="src/android/AudioPlayer.java" target-dir="src/org/apache/cordova/media"/>
-    <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/media"/>
-  </platform>
-  <platform name="amazon-fireos">
-    <config-file target="res/xml/config.xml" parent="/*">
-      <feature name="Media">
-        <param name="android-package" value="org.apache.cordova.media.AudioHandler"/>
-      </feature>
-    </config-file>
-    <config-file target="AndroidManifest.xml" parent="/*">
-      <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-      <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-      <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-      <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    </config-file>
-    <source-file src="src/android/AudioHandler.java" target-dir="src/org/apache/cordova/media"/>
-    <source-file src="src/android/AudioPlayer.java" target-dir="src/org/apache/cordova/media"/>
-    <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/media"/>
-  </platform>
-  <platform name="ubuntu">
-    <config-file target="config.xml" parent="/*">
-      <feature name="Media">
-        <param policy_group="microphone" policy_version="1"/>
-        <param policy_group="video" policy_version="1"/>
-      </feature>
-    </config-file>
-    <header-file src="src/ubuntu/media.h"/>
-    <source-file src="src/ubuntu/media.cpp"/>
-  </platform>
-  <platform name="ios">
-    <config-file target="config.xml" parent="/*">
-      <feature name="Media">
-        <param name="ios-package" value="CDVSound"/>
-      </feature>
-    </config-file>
-    <config-file target="*-Info.plist" parent="NSMicrophoneUsageDescription">
-      <string>$MICROPHONE_USAGE_DESCRIPTION</string>
-    </config-file>
-    <header-file src="src/ios/CDVSound.h"/>
-    <source-file src="src/ios/CDVSound.m"/>
-    <preference name="MICROPHONE_USAGE_DESCRIPTION" default=" "/>
-  </platform>
-  <platform name="blackberry10">
-    <source-file src="src/blackberry10/index.js" target-dir="Media"/>
-    <config-file target="www/config.xml" parent="/widget">
-      <feature name="Media" value="Media"/>
-    </config-file>
-  </platform>
-  <platform name="wp7">
-    <config-file target="config.xml" parent="/*">
-      <feature name="Media">
-        <param name="wp-package" value="Media"/>
-      </feature>
-    </config-file>
-    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
-      <Capability Name="ID_CAP_MEDIALIB"/>
-      <Capability Name="ID_CAP_MICROPHONE"/>
-    </config-file>
-    <source-file src="src/wp/Media.cs"/>
-    <source-file src="src/wp/AudioPlayer.cs"/>
-  </platform>
-  <platform name="wp8">
-    <config-file target="config.xml" parent="/*">
-      <feature name="Media">
-        <param name="wp-package" value="Media"/>
-      </feature>
-    </config-file>
-    <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
-      <Capability Name="ID_CAP_MEDIALIB_AUDIO"/>
-      <Capability Name="ID_CAP_MEDIALIB_PLAYBACK"/>
-      <Capability Name="ID_CAP_MICROPHONE"/>
-    </config-file>
-    <source-file src="src/wp/Media.cs"/>
-    <source-file src="src/wp/AudioPlayer.cs"/>
-  </platform>
-  <platform name="windows8">
-    <js-module src="src/windows/MediaProxy.js" name="MediaProxy">
-      <runs/>
+<?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:android="http://schemas.android.com/apk/res/android"
+id="cordova-plugin-media"
+    version="3.0.1-dev">
+
+    <name>Media</name>
+    <description>Cordova Media Plugin</description>
+    <license>Apache 2.0</license>
+    <keywords>cordova,media</keywords>
+    <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git</repo>
+    <issue>https://issues.apache.org/jira/browse/CB/component/12320647</issue>
+
+    <engines>
+        <engine name="cordova-android" version=">=6.1.0" />
+    </engines>
+
+    <dependency id="cordova-plugin-file" version="^4.0.0" />
+    <dependency id="cordova-plugin-compat" version="^1.0.0" />
+
+    <js-module src="www/MediaError.js" name="MediaError">
+        <clobbers target="window.MediaError" />
     </js-module>
-    <config-file target="package.appxmanifest" parent="/Package/Capabilities">
-      <DeviceCapability Name="microphone"/>
-    </config-file>
-  </platform>
-  <platform name="windows">
-    <js-module src="src/windows/MediaProxy.js" name="MediaProxy">
-      <runs/>
+
+    <js-module src="www/Media.js" name="Media">
+        <clobbers target="window.Media" />
     </js-module>
-    <config-file target="package.appxmanifest" parent="/Package/Capabilities">
-      <DeviceCapability Name="microphone"/>
-    </config-file>
-  </platform>
-  <platform name="tizen">
-    <js-module src="src/tizen/MediaProxy.js" name="MediaProxy">
-      <runs/>
-    </js-module>
-  </platform>
-  <platform name="browser">
-    <js-module src="www/browser/Media.js" name="BrowserMedia">
-      <clobbers target="window.Media"/>
-    </js-module>
-  </platform>
+
+    <!-- android -->
+    <platform name="android">
+        <config-file target="res/xml/config.xml" parent="/*">
+            <feature name="Media" >
+                <param name="android-package" value="org.apache.cordova.media.AudioHandler"/>
+            </feature>
+        </config-file>
+
+        <config-file target="AndroidManifest.xml" parent="/*">
+            <uses-permission android:name="android.permission.RECORD_AUDIO" />
+            <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+            <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+        </config-file>
+
+        <source-file src="src/android/AudioHandler.java" target-dir="src/org/apache/cordova/media" />
+        <source-file src="src/android/AudioPlayer.java" target-dir="src/org/apache/cordova/media" />
+        <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/media" />
+    </platform>
+
+     <!-- amazon-fireos -->
+    <platform name="amazon-fireos">
+        <config-file target="res/xml/config.xml" parent="/*">
+            <feature name="Media" >
+                <param name="android-package" value="org.apache.cordova.media.AudioHandler"/>
+            </feature>
+        </config-file>
+
+        <config-file target="AndroidManifest.xml" parent="/*">
+            <uses-permission android:name="android.permission.RECORD_AUDIO" />
+            <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+            <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+            <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+        </config-file>
+
+        <source-file src="src/android/AudioHandler.java" target-dir="src/org/apache/cordova/media" />
+        <source-file src="src/android/AudioPlayer.java" target-dir="src/org/apache/cordova/media" />
+        <source-file src="src/android/FileHelper.java" target-dir="src/org/apache/cordova/media" />
+    </platform>
+
+
+    <!-- ubuntu -->
+    <platform name="ubuntu">
+        <config-file target="config.xml" parent="/*">
+            <feature name="Media">
+                <param policy_group="microphone" policy_version="1" />
+                <param policy_group="video" policy_version="1" />
+            </feature>
+        </config-file>
+        <header-file src="src/ubuntu/media.h" />
+        <source-file src="src/ubuntu/media.cpp" />
+    </platform>
+
+    <!-- ios -->
+    <platform name="ios">
+        <config-file target="config.xml" parent="/*">
+            <feature name="Media">
+                <param name="ios-package" value="CDVSound" />
+            </feature>
+        </config-file>
+        <header-file src="src/ios/CDVSound.h" />
+        <source-file src="src/ios/CDVSound.m" />
+        <preference name="MICROPHONE_USAGE_DESCRIPTION" default=" " />
+        <config-file target="*-Info.plist" parent="NSMicrophoneUsageDescription">
+            <string>$MICROPHONE_USAGE_DESCRIPTION</string>
+        </config-file>
+    </platform>
+
+    <!-- blackberry10 -->
+    <platform name="blackberry10">
+        <source-file src="src/blackberry10/index.js" target-dir="Media" />
+        <config-file target="www/config.xml" parent="/widget">
+            <feature name="Media" value="Media"/>
+        </config-file>
+    </platform>
+
+    <!-- wp7 -->
+    <platform name="wp7">
+        <config-file target="config.xml" parent="/*">
+            <feature name="Media">
+                <param name="wp-package" value="Media"/>
+            </feature>
+        </config-file>
+
+        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+            <Capability Name="ID_CAP_MEDIALIB"/>
+            <Capability Name="ID_CAP_MICROPHONE"/>
+        </config-file>
+
+        <source-file src="src/wp/Media.cs" />
+        <source-file src="src/wp/AudioPlayer.cs" />
+    </platform>
+
+    <!-- wp8 -->
+    <platform name="wp8">
+        <config-file target="config.xml" parent="/*">
+            <feature name="Media">
+                <param name="wp-package" value="Media"/>
+            </feature>
+        </config-file>
+
+        <config-file target="Properties/WMAppManifest.xml" parent="/Deployment/App/Capabilities">
+            <Capability Name="ID_CAP_MEDIALIB_AUDIO"/>
+            <Capability Name="ID_CAP_MEDIALIB_PLAYBACK"/>
+            <Capability Name="ID_CAP_MICROPHONE"/>
+        </config-file>
+
+        <source-file src="src/wp/Media.cs" />
+        <source-file src="src/wp/AudioPlayer.cs" />
+    </platform>
+
+    <!-- windows8 -->
+    <platform name="windows8">
+        <js-module src="src/windows/MediaProxy.js" name="MediaProxy">
+            <runs />
+        </js-module>
+
+        <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+            <DeviceCapability Name="microphone" />
+        </config-file>
+    </platform>
+
+    <!-- windows -->
+    <platform name="windows">
+        <js-module src="src/windows/MediaProxy.js" name="MediaProxy">
+            <runs />
+        </js-module>
+
+        <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+            <DeviceCapability Name="microphone" />
+        </config-file>
+    </platform>
+
+    <!-- tizen -->
+    <platform name="tizen">
+        <js-module src="src/tizen/MediaProxy.js" name="MediaProxy">
+            <runs/>
+        </js-module>
+    </platform>
+
+    <!-- browser -->
+    <platform name="browser">
+        <js-module src="www/browser/Media.js" name="BrowserMedia">
+            <clobbers target="window.Media" />
+        </js-module>
+    </platform>
+
 </plugin>

http://git-wip-us.apache.org/repos/asf/cordova-plugin-media/blob/8c2de081/tests/plugin.xml
----------------------------------------------------------------------
diff --git a/tests/plugin.xml b/tests/plugin.xml
index 257859f..abe7876 100644
--- a/tests/plugin.xml
+++ b/tests/plugin.xml
@@ -1,6 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:rim="http://www.blackberry.com/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-media-tests" version="3.0.0">
-  <name>Cordova Media Plugin Tests</name>
-  <license>Apache 2.0</license>
-  <js-module src="tests.js" name="tests"/>
+<?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"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    id="cordova-plugin-media-tests"
+    version="3.0.1-dev">
+    <name>Cordova Media Plugin Tests</name>
+    <license>Apache 2.0</license>
+    <js-module src="tests.js" name="tests">
+    </js-module>
 </plugin>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org