Bump version

Author: SergeShkurko

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.0
+
+- Merge all pull requests
+
 ## 3.0.0
 ### Changed
 - `metadata` file now saves as `mimetype` [pull#1](https://github.com/rbcprolabs/epubx.dart/pull/1) 

example/flutter_ex/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -171,10 +171,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -185,6 +187,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -272,7 +275,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -346,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -395,7 +398,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

example/flutter_ex/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example/flutter_ex/ios/Runner/Info.plist

@@ -41,5 +41,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

lib/src/ref_entities/epub_content_file_ref.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
+import 'dart:convert' as convert;
 
 import 'package:archive/archive.dart';
-import 'dart:convert' as convert;
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:quiver/core.dart';
 
@@ -30,8 +30,7 @@ abstract class EpubContentFileRef {
       return false;
     }
 
-    return (other is EpubContentFileRef &&
-        other.FileName == FileName &&
+    return (other.FileName == FileName &&
         other.ContentMimeType == ContentMimeType &&
         other.ContentType == ContentType);
   }

lib/src/writers/epub_navigation_writer.dart

@@ -1,5 +1,4 @@
 import 'package:epubx/src/schema/navigation/epub_navigation.dart';
-import 'package:epubx/src/schema/navigation/epub_navigation_doc_author.dart';
 import 'package:epubx/src/schema/navigation/epub_navigation_doc_title.dart';
 import 'package:epubx/src/schema/navigation/epub_navigation_head.dart';
 import 'package:epubx/src/schema/navigation/epub_navigation_map.dart';
@@ -27,7 +26,8 @@ class EpubNavigationWriter {
     return builder.buildDocument().toXmlString(pretty: false);
   }
 
-  static void writeNavigationDocTitle(XmlBuilder builder, EpubNavigationDocTitle title) {
+  static void writeNavigationDocTitle(
+      XmlBuilder builder, EpubNavigationDocTitle title) {
     builder.element('docTitle', nest: () {
       title.Titles!.forEach((element) {
         builder.text(element);
@@ -36,24 +36,20 @@ class EpubNavigationWriter {
   }
 
   static void writeNavigationHead(XmlBuilder builder, EpubNavigationHead head) {
-    builder.element('head',
-        nest: () {
-          head.Metadata!.forEach((item) => builder.element('meta',
-              attributes: {
-                'content': item.Content!,
-                'name': item.Name!
-              }));
-        });
+    builder.element('head', nest: () {
+      head.Metadata!.forEach((item) => builder.element('meta',
+          attributes: {'content': item.Content!, 'name': item.Name!}));
+    });
   }
 
   static void writeNavigationMap(XmlBuilder builder, EpubNavigationMap map) {
-    builder.element('navMap',
-        nest: () {
-          map.Points!.forEach((item) => writeNavigationPoint(builder, item));
-        });
+    builder.element('navMap', nest: () {
+      map.Points!.forEach((item) => writeNavigationPoint(builder, item));
+    });
   }
 
-  static void writeNavigationPoint(XmlBuilder builder, EpubNavigationPoint point) {
+  static void writeNavigationPoint(
+      XmlBuilder builder, EpubNavigationPoint point) {
     builder.element('navPoint', attributes: {
       'id': point.Id!,
       'playOrder': point.PlayOrder!,
@@ -65,8 +61,7 @@ class EpubNavigationWriter {
           });
         });
       });
-      builder.element('content', attributes: { 'src': point.Content!.Source! });
+      builder.element('content', attributes: {'src': point.Content!.Source!});
     });
   }
-
 }

pubspec.yaml

@@ -2,10 +2,10 @@ name: epubx
 description: Epub Parser for Dart. Epub package fork. Suitable for use on the Server, the Web, or in Flutter
 homepage: https://github.com/rbcprolabs/epubx.dart
 issue_tracker: https://github.com/rbcprolabs/epubx.dart
-version: 3.0.0
+version: 4.0.0
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
 
 dependencies:
   archive: ^3.1.6