Merge branch 'release/1.5.2'

techprimate · Jun 30, 2019 · 8568df4 · 8568df4
2 parents 9c12812 + 72bf6de
commit 8568df4
Show file tree

Hide file tree

Showing 29 changed files with 2,070 additions and 2,001 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,8 +1,8 @@
 PODS:
-  - Nimble (8.0.1)
+  - Nimble (8.0.2)
   - Quick (2.1.0)
-  - SwiftLint (0.32.0)
-  - TPPDF (1.4.1):
+  - SwiftLint (0.33.0)
+  - TPPDF (1.5.1):
     - SwiftLint
 
 DEPENDENCIES:
@@ -21,11 +21,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
+  Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
   Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
-  SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
-  TPPDF: b74658b7cdde129e4bc508307437b9affd9f6229
+  SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
+  TPPDF: 58727d44e2275148342164934b0f5b14c8924f8a
 
 PODFILE CHECKSUM: 72831a7ced7b912394f864c2ffd8f8f0fac7bfd5
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.3
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/Pods-TPPDF_Example/Pods-TPPDF_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-TPPDF_Example/Pods-TPPDF_Example-frameworks.sh
diff --git a/Example/Pods/Target Support Files/Pods-TPPDF_Tests/Pods-TPPDF_Tests-frameworks.sh b/Example/Pods/Target Support Files/Pods-TPPDF_Tests/Pods-TPPDF_Tests-frameworks.sh
diff --git a/Example/TPPDF.xcodeproj/project.pbxproj b/Example/TPPDF.xcodeproj/project.pbxproj
@@ -661,15 +661,11 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-TPPDF_Example/Pods-TPPDF_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/TPPDF/TPPDF.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TPPDF.framework",
 			);
@@ -683,16 +679,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-TPPDF_Tests/Pods-TPPDF_Tests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,11 +10,11 @@ GEM
     atomos (0.1.3)
     claide (1.0.2)
     clamp (1.3.0)
-    cocoapods (1.6.1)
+    cocoapods (1.7.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.7.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
@@ -23,13 +23,13 @@ GEM
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.10.0, < 2.0)
+    cocoapods-core (1.7.3)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
@@ -46,37 +46,37 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     escape (0.0.4)
-    ffi (1.10.0)
-    fourflusher (2.2.0)
+    ffi (1.11.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.9.4)
-      cocoapods (~> 1.0)
-      mustache (~> 0.99)
+    jazzy (0.10.0)
+      cocoapods (~> 1.5)
+      mustache (~> 1.1)
       open4
-      redcarpet (~> 3.2)
+      redcarpet (~> 3.4)
       rouge (>= 2.0.6, < 4.0)
-      sass (~> 3.4)
+      sass (~> 3.6)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
     liferaft (0.0.6)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     molinillo (0.6.6)
-    mustache (0.99.8)
+    mustache (1.1.0)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    nokogiri (1.10.2)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     open4 (1.3.4)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     redcarpet (3.4.0)
-    rouge (3.3.0)
+    rouge (3.5.1)
     ruby-macho (1.4.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -89,13 +89,13 @@ GEM
       clamp (~> 1.3)
       nokogiri (~> 1.8)
       xcodeproj (~> 1.7)
-    sqlite3 (1.4.0)
+    sqlite3 (1.4.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.8.2)
+    xcodeproj (1.10.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

diff --git a/Source/Graphics/PDFBezierPath.swift b/Source/Graphics/PDFBezierPath.swift
@@ -11,7 +11,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFBezierPath {
+public class PDFBezierPath: CustomStringConvertible {
 
     /**
      TODO: Documentation

diff --git a/Source/Graphics/PDFBezierPathVertex.swift b/Source/Graphics/PDFBezierPathVertex.swift
@@ -11,7 +11,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFBezierPathVertex {
+public class PDFBezierPathVertex: CustomStringConvertible {
 
     /**
      TODO: Documentation

diff --git a/Source/Graphics/PDFDynamicGeometryShape.swift b/Source/Graphics/PDFDynamicGeometryShape.swift
@@ -11,7 +11,7 @@ import UIKit
 /**
  TODO: Documentation
  */
-public class PDFDynamicGeometryShape {
+public class PDFDynamicGeometryShape: CustomStringConvertible {
 
     /**
      TODO: Documentation

diff --git a/Source/Layout/Groups/PDFGroupContainer.swift b/Source/Layout/Groups/PDFGroupContainer.swift
@@ -30,6 +30,17 @@ public enum PDFGroupContainer {
      */
     case right
 
+
+    internal init(from container: PDFContainer) {
+        if container.isLeft {
+            self = .left
+        } else if container.isRight {
+            self = .right
+        } else {
+            self = .center
+        }
+    }
+
     /**
      Array of all possible containers, expect `.none`.
      Useful for initalizing default values for each container