Update dependencies

Author: Electric Bolt

CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 1.4.0
+- Updated dependencies in pubspec.yaml.
+
 #### 1.3.0
 - Added additional unit-test for binary property list deserialization.
 - Updated dependencies in pubspec.yaml.

lib/src/dateutil.dart

@@ -3,7 +3,6 @@
 
 /// Binary plist dates have an epoch of 01 January 2001. Parameter [d] date in
 /// milliseconds from epoch. Returns a [DateTime].
-
 DateTime parseBinary(double d) {
   final binaryPlistEpoch = DateTime.utc(2001, DateTime.january, 1);
   return binaryPlistEpoch.add(Duration(seconds: d.toInt()));
@@ -48,8 +47,9 @@ String _formatTwoDigits(int n) {
 }
 
 String formatXML(DateTime d) {
-  final year = (d.year >= -9999 && d.year <= 9999) ? _formatFourDigits(d.year) :
-    _formatSixDigits(d.year);
+  final year = (d.year >= -9999 && d.year <= 9999)
+      ? _formatFourDigits(d.year)
+      : _formatSixDigits(d.year);
   final month = _formatTwoDigits(d.month);
   final day = _formatTwoDigits(d.day);
   final hour = _formatTwoDigits(d.hour);

lib/src/xmlpropertylistreader.dart

@@ -9,14 +9,15 @@ import 'package:propertylistserialization/src/dateutil.dart';
 import 'package:xml/xml_events.dart';
 
 class XMLPropertyListReader {
-
   final String _plist;
   late Iterator<XmlEvent> _events;
   XmlEvent? _pushbackEvent;
   late int _logIndent = 0;
   final bool _logging = false;
 
-  XMLPropertyListReader(String plist) : _plist = plist, _pushbackEvent = null;
+  XMLPropertyListReader(String plist)
+      : _plist = plist,
+        _pushbackEvent = null;
 
   Object parse() {
     _events = parseEvents(_plist).iterator;
@@ -30,7 +31,9 @@ class XMLPropertyListReader {
     _logStart('<plist>');
     final event = _nextEventSkipOptionalText();
     if (event is! XmlStartElementEvent) {
-      throw _expected(event, 'XmlStartElementEvent (array,dict,string,data,'
+      throw _expected(
+          event,
+          'XmlStartElementEvent (array,dict,string,data,'
           'date,integer,real,true,false)');
     }
     final result = _readObject(event);
@@ -40,7 +43,7 @@ class XMLPropertyListReader {
   }
 
   Object _readObject(XmlStartElementEvent event) {
-    switch(event.name) {
+    switch (event.name) {
       case 'array':
         return _readArray(event.isSelfClosing);
       case 'dict':
@@ -93,7 +96,9 @@ class XMLPropertyListReader {
     var event = _nextEventSkipOptionalText();
     while (event is! XmlEndElementEvent) {
       if (event is! XmlStartElementEvent) {
-        throw _expected(event, 'XmlStartElementEvent (array,dict,string,data,'
+        throw _expected(
+            event,
+            'XmlStartElementEvent (array,dict,string,data,'
             'date,integer,real,true,false)');
       }
       list.add(_readObject(event));
@@ -129,13 +134,15 @@ class XMLPropertyListReader {
       if (event is! XmlTextEvent) {
         throw _expected(event, 'XmlTextEvent');
       }
-      final key = event.text; // key: always a string
+      final key = event.value; // key: always a string
       _requireEndElement('key');
       _log('<key>$key</key>');
       // Read value
       event = _nextEvent();
       if (event is! XmlStartElementEvent) {
-        throw _expected(event, 'XmlStartElementEvent (array,dict,string,data,'
+        throw _expected(
+            event,
+            'XmlStartElementEvent (array,dict,string,data,'
             'date,integer,real,true,false)');
       }
       dict[key] = _readObject(event);
@@ -168,7 +175,7 @@ class XMLPropertyListReader {
 
       // Remove any whitespace from the entire string (including interior
       // characters). The result should be a single line Base64 string.
-      sb.write(event.text.replaceAll(RegExp(r'\s+'), ''));
+      sb.write(event.value.replaceAll(RegExp(r'\s+'), ''));
       event = _nextEvent();
     }
 
@@ -198,7 +205,7 @@ class XMLPropertyListReader {
       if (event is! XmlTextEvent) {
         throw _expected(event, 'XmlTextEvent');
       }
-      final result = event.text.trim();
+      final result = event.value.trim();
       _requireEndElement(tagName);
       _log('<$tagName>$result</$tagName>');
       return result;
@@ -246,7 +253,9 @@ class XMLPropertyListReader {
   void _requireDoctype() {
     final event = _nextEvent();
     if (event is! XmlDoctypeEvent) {
-      throw _expected(event, '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//'
+      throw _expected(
+          event,
+          '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//'
           'EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">');
     }
     _skipOptionalText();
@@ -351,5 +360,4 @@ class XMLPropertyListReader {
       print(''.padLeft(_logIndent) + text);
     }
   }
-
 }

lib/src/xmlpropertylistwriter.dart

@@ -147,13 +147,10 @@ class XMLPropertyListWriter {
       switch (c) {
         case '<':
           sb.write('&lt;');
-          break;
         case '>':
           sb.write('&gt;');
-          break;
         case '&':
           sb.write('&amp;');
-          break;
         default:
           sb.write(c);
       }

pubspec.yaml

@@ -1,15 +1,15 @@
 name: propertylistserialization
 description: iOS compatible plist serialization and deserialization library for Dart.
-version: 1.3.0
+version: 1.4.0
 homepage: https://github.com/electricbolt/dartpropertylistserialization
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  convert: ^3.1.0
-  xml: ^6.0.0
+  convert: ^3.1.1
+  xml: ^6.5.0
 
 dev_dependencies:
-  lint: ^2.0.1
-  test: ^1.24.0
+  lint: ^2.3.0
+  test: ^1.25.8