You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2013/07/11 02:48:18 UTC

ios commit: [CB-3175] Change to in config.xml and remove deprecation notice in iOS

Updated Branches:
  refs/heads/master c24b6e3ac -> 3e18f93ef


[CB-3175] Change <plugin> to <feature> in config.xml and remove deprecation notice in iOS


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/3e18f93e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/3e18f93e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/3e18f93e

Branch: refs/heads/master
Commit: 3e18f93ef8d468a7e79fc97566ad548e5034c264
Parents: c24b6e3
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Jul 10 17:48:08 2013 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Wed Jul 10 17:48:08 2013 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVConfigParser.m         | 13 ------
 CordovaLibTests/CordovaLibApp/config.xml     | 55 -----------------------
 bin/templates/project/__TESTING__/config.xml |  6 ---
 3 files changed, 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3e18f93e/CordovaLib/Classes/CDVConfigParser.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVConfigParser.m b/CordovaLib/Classes/CDVConfigParser.m
index 83fe83f..bf7ff4b 100644
--- a/CordovaLib/Classes/CDVConfigParser.m
+++ b/CordovaLib/Classes/CDVConfigParser.m
@@ -50,19 +50,6 @@
 {
     if ([elementName isEqualToString:@"preference"]) {
         settings[[attributeDict[@"name"] lowercaseString]] = attributeDict[@"value"];
-    } else if ([elementName isEqualToString:@"plugin"]) {
-        NSString* name = [attributeDict[@"name"] lowercaseString];
-        pluginsDict[name] = attributeDict[@"value"];
-        if ([@"true" isEqualToString : attributeDict[@"onload"]]) {
-            [self.startupPluginNames addObject:name];
-        }
-        NSLog(@"\nUse of the <plugin> tag has been deprecated. Use a <feature> tag instead. Change:\n"
-            @"    <plugin name=\"%@\" value=\"%@\" />\n"
-            @"To:\n"
-            @"    <feature name=\"%@\">\n"
-            @"        <param name=\"ios-package\" value=\"%@\" />\n"
-            @"    </feature>\n"
-            , attributeDict[@"name"], attributeDict[@"value"], attributeDict[@"name"], attributeDict[@"value"]);
     } else if ([elementName isEqualToString:@"feature"]) { // store feature name to use with correct parameter set
         featureName = [attributeDict[@"name"] lowercaseString];
     } else if ((featureName != nil) && [elementName isEqualToString:@"param"]) {

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3e18f93e/CordovaLibTests/CordovaLibApp/config.xml
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CordovaLibApp/config.xml b/CordovaLibTests/CordovaLibApp/config.xml
index 4fb4e6e..cae1e58 100644
--- a/CordovaLibTests/CordovaLibApp/config.xml
+++ b/CordovaLibTests/CordovaLibApp/config.xml
@@ -51,61 +51,6 @@
     <preference name="SuppressesIncrementalRendering" value="false" />
     <preference name="TopActivityIndicator" value="gray" />
 
-
-    <feature name="Geolocation">
-      <param name="ios-package" value="CDVLocation"/>
-    </feature>
-    <feature name="Device">
-      <param name="ios-package" value="CDVDevice"/>
-    </feature>
-    <feature name="Accelerometer">
-      <param name="ios-package" value="CDVAccelerometer"/>
-    </feature>
-    <feature name="Compass">
-      <param name="ios-package" value="CDVLocation"/>
-    </feature>
-    <feature name="Media">
-      <param name="ios-package" value="CDVSound"/>
-    </feature>
-    <feature name="Camera">
-      <param name="ios-package" value="CDVCamera"/>
-    </feature>
-    <feature name="Contacts">
-      <param name="ios-package" value="CDVContacts"/>
-    </feature>
-    <feature name="File">
-      <param name="ios-package"  value="CDVFile"/>
-    </feature>
-    <feature name="NetworkStatus">
-      <param name="ios-package" value="CDVConnection"/>
-    </feature>
-    <feature name="Notification">
-      <param name="ios-package" value="CDVNotification"/>
-    </feature>
-    <feature name="FileTransfer">
-      <param name="ios-package" value="CDVFileTransfer"/>
-    </feature>
-    <feature name="Capture">
-      <param name="ios-package" value="CDVCapture"/>
-    </feature>
-    <feature name="Battery">
-      <param name="ios-package" value="CDVBattery"/>
-    </feature>
-    <feature name="SplashScreen">
-      <param name="ios-package" value="CDVSplashScreen"/>
-    </feature>
-    <feature name="Echo">
-      <param name="ios-package" value="CDVEcho"/>
-    </feature>
-    <feature name="Globalization">
-      <param name="ios-package" value="CDVGlobalization"/>
-    </feature>
-    <feature name="InAppBrowser">
-      <param name="ios-package" value="CDVInAppBrowser"/>
-    </feature>
-    <feature name="Logger">
-      <param name="ios-package" value="CDVLogger"/>
-    </feature>
     <feature name="LocalStorage">
         <param name="ios-package" value="CDVLocalStorage"/>
     </feature>

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/3e18f93e/bin/templates/project/__TESTING__/config.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/__TESTING__/config.xml b/bin/templates/project/__TESTING__/config.xml
index 49b2ba9..cae1e58 100644
--- a/bin/templates/project/__TESTING__/config.xml
+++ b/bin/templates/project/__TESTING__/config.xml
@@ -51,13 +51,7 @@
     <preference name="SuppressesIncrementalRendering" value="false" />
     <preference name="TopActivityIndicator" value="gray" />
 
-    <feature name="Logger">
-      <param name="ios-package" value="CDVLogger"/>
-    </feature>
     <feature name="LocalStorage">
         <param name="ios-package" value="CDVLocalStorage"/>
     </feature>
-    <!-- Deprecated plugins element. REmove in 3.0 -->
-    <plugins>
-    </plugins>
 </widget>