Some additional improvements and fixes

PGSSoft · Apr 5, 2019 · 3487823 · 3487823
1 parent 175d839
commit 3487823
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 29 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 PGS Software
+Copyright (c) 2019 PGS Software
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/PuzzleMaker.podspec b/PuzzleMaker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'PuzzleMaker'
-    s.version = '1.2.0'
+    s.version = '1.2.1'
     s.license = 'MIT'
     s.summary = 'Swift framework responsible for generating puzzles from the image'
     s.homepage = 'https://github.com/PGSSoft/PuzzleMaker'

diff --git a/PuzzleMaker.xcodeproj/project.pbxproj b/PuzzleMaker.xcodeproj/project.pbxproj
@@ -18,7 +18,6 @@
 		48DC7DDE1D59F01A0024C008 /* PuzzleUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC7DDD1D59F01A0024C008 /* PuzzleUnit.swift */; };
 		48DC7DE01D59F0330024C008 /* Segment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC7DDF1D59F0330024C008 /* Segment.swift */; };
 		48DC7DE21D59F04C0024C008 /* CubicBezierCurve.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC7DE11D59F04C0024C008 /* CubicBezierCurve.swift */; };
-		48DC7DE61D59F0880024C008 /* Bool+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC7DE51D59F0880024C008 /* Bool+Extensions.swift */; };
 		48DC7DE81D59F09A0024C008 /* UIImage+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC7DE71D59F09A0024C008 /* UIImage+Extensions.swift */; };
 		48DC7DEA1D59F0AE0024C008 /* UIBezierPath+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC7DE91D59F0AE0024C008 /* UIBezierPath+Extensions.swift */; };
 		48EDA59C1D5B5F7B00518DF0 /* PuzzleMaker.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 48EDA59B1D5B5F7B00518DF0 /* PuzzleMaker.podspec */; };
@@ -51,7 +50,6 @@
 		48DC7DDD1D59F01A0024C008 /* PuzzleUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PuzzleUnit.swift; sourceTree = "<group>"; };
 		48DC7DDF1D59F0330024C008 /* Segment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Segment.swift; sourceTree = "<group>"; };
 		48DC7DE11D59F04C0024C008 /* CubicBezierCurve.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CubicBezierCurve.swift; sourceTree = "<group>"; };
-		48DC7DE51D59F0880024C008 /* Bool+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bool+Extensions.swift"; sourceTree = "<group>"; };
 		48DC7DE71D59F09A0024C008 /* UIImage+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Extensions.swift"; sourceTree = "<group>"; };
 		48DC7DE91D59F0AE0024C008 /* UIBezierPath+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIBezierPath+Extensions.swift"; sourceTree = "<group>"; };
 		48EDA59B1D5B5F7B00518DF0 /* PuzzleMaker.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PuzzleMaker.podspec; path = ../PuzzleMaker.podspec; sourceTree = "<group>"; };
@@ -93,7 +91,6 @@
 			isa = PBXGroup;
 			children = (
 				487E92E3225635BF00AAC84D /* Array+Extensions.swift */,
-				48DC7DE51D59F0880024C008 /* Bool+Extensions.swift */,
 				48DC7DE91D59F0AE0024C008 /* UIBezierPath+Extensions.swift */,
 				48DC7DE71D59F09A0024C008 /* UIImage+Extensions.swift */,
 			);
@@ -316,7 +313,6 @@
 				48DC7DDC1D59EFF50024C008 /* PuzzleElement.swift in Sources */,
 				48DC7DE81D59F09A0024C008 /* UIImage+Extensions.swift in Sources */,
 				48DC7DD81D59EF740024C008 /* PuzzleMaker.swift in Sources */,
-				48DC7DE61D59F0880024C008 /* Bool+Extensions.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Sources/Bool+Extensions.swift b/Sources/Bool+Extensions.swift
diff --git a/Sources/Info-iOS.plist b/Sources/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Sources/PuzzleUnitFactory.swift b/Sources/PuzzleUnitFactory.swift
@@ -86,7 +86,7 @@ public struct PuzzleUnitFactory {
             fallthrough
         case .missing:
             rightSegment.scale(size.height, syFactor: size.height)
-            if Bool.random { // Pick up randomly whether segment should be 'outer' or 'inner'
+            if Bool.random() { // Pick up randomly whether segment should be 'outer' or 'inner'
                 rightSegment.mirror()
             }
         case var .mirror(segment):
@@ -105,7 +105,7 @@ public struct PuzzleUnitFactory {
             fallthrough
         case .missing:
             bottomSegment.scale(size.width, syFactor: size.width)
-            if Bool.random {
+            if Bool.random() {
                 bottomSegment.mirror()
             }
         case var .mirror(segment):

diff --git a/iOS Example/iOS Example/Info.plist b/iOS Example/iOS Example/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>