Upgrade project format, prepare for v1.0

topicusonderwijs · Nov 26, 2017 · dc02292 · dc02292
1 parent 72797fb
commit dc02292
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 26 deletions.
diff --git a/Source/Toucan-Info.plist b/Source/Toucan-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6</string>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Source/Toucan.h b/Source/Toucan.h
@@ -1,6 +1,6 @@
 // Toucan.h
 //
-// Copyright (c) 2014-2017 Gavin Bunney, Bunney Apps (http://bunney.net.au)
+// Copyright (c) 2014-2017 Gavin Bunney
 //
 // 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/Source/Toucan.swift b/Source/Toucan.swift
@@ -1,6 +1,6 @@
 // Toucan.swift
 //
-// Copyright (c) 2014-2017 Gavin Bunney, Bunney Apps (http://bunney.net.au)
+// Copyright (c) 2014-2017 Gavin Bunney
 //
 // 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/Source/tvOS/Toucan.tvOS-Info.plist b/Source/tvOS/Toucan.tvOS-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6</string>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Source/tvOS/ToucanTVOS.h b/Source/tvOS/ToucanTVOS.h
@@ -1,6 +1,6 @@
 // ToucanTVOS.h
 //
-// Copyright (c) 2014-2017 Gavin Bunney, Bunney Apps (http://bunney.net.au)
+// Copyright (c) 2014-2017 Gavin Bunney
 //
 // 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/Tests/MaskingTests.swift b/Tests/MaskingTests.swift
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Gavin Bunney, Bunney Apps (http://bunney.net.au)
+// Copyright (c) 2014-2017 Gavin Bunney
 //
 // 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/Tests/ResizeTests.swift b/Tests/ResizeTests.swift
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Gavin Bunney, Bunney Apps (http://bunney.net.au)
+// Copyright (c) 2014-2017 Gavin Bunney
 //
 // 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/Tests/ToucanTestCase.swift b/Tests/ToucanTestCase.swift
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2017 Gavin Bunney, Bunney Apps (http://bunney.net.au)
+// Copyright (c) 2014-2017 Gavin Bunney
 //
 // 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/Toucan.xcodeproj/project.pbxproj b/Toucan.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -231,7 +231,7 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0910;
-				ORGANIZATIONNAME = "Simple Labs";
+				ORGANIZATIONNAME = "Gavin Bunney";
 				TargetAttributes = {
 					740AC3E91999799900AB9A86 = {
 						CreatedOnToolsVersion = 6.0;
@@ -248,7 +248,7 @@
 				};
 			};
 			buildConfigurationList = 740AC3E41999799900AB9A86 /* Build configuration list for PBXProject "Toucan" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -452,7 +452,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = co.thesimplelab.Toucan;
+				PRODUCT_BUNDLE_IDENTIFIER = com.github.gavinbunney.Toucan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -475,7 +475,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = co.thesimplelab.Toucan;
+				PRODUCT_BUNDLE_IDENTIFIER = com.github.gavinbunney.Toucan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -529,7 +529,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Source/tvOS/Toucan.tvOS-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = co.thesimplelab.Toucan.tvOS;
+				PRODUCT_BUNDLE_IDENTIFIER = com.github.gavinbunney.Toucan.tvOS;
 				PRODUCT_NAME = Toucan;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
@@ -556,7 +556,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Source/tvOS/Toucan.tvOS-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = co.thesimplelab.Toucan.tvOS;
+				PRODUCT_BUNDLE_IDENTIFIER = com.github.gavinbunney.Toucan.tvOS;
 				PRODUCT_NAME = Toucan;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;

diff --git a/ToucanPlayground.playground/Contents.swift b/ToucanPlayground.playground/Contents.swift
@@ -50,25 +50,25 @@ Toucan(image: portraitImage!).resize(CGSize(width: 500, height: 500), fitMode: T
 // Masking
 // ------------------------------------------------------------
 
-let landscapeCropped = Toucan(image: landscapeImage!).resize(CGSize(width: 500, height: 500), fitMode: Toucan.Resize.FitMode.crop).image
+let landscapeCropped = Toucan(image: landscapeImage!).resize(CGSize(width: 500, height: 500), fitMode: Toucan.Resize.FitMode.crop).image!
 
 // We can mask with an ellipse!
 Toucan(image: landscapeImage!).maskWithEllipse().image
 
 // Demonstrate creating a circular mask -> resizes to a square image then mask with an ellipse
-Toucan(image: landscapeCropped).maskWithEllipse().image
+Toucan(image: landscapeCropped).maskWithEllipse().image!
 
 // Mask with borders too!
-Toucan(image: landscapeCropped).maskWithEllipse(borderWidth: 10, borderColor: UIColor.yellow).image
+Toucan(image: landscapeCropped).maskWithEllipse(borderWidth: 10, borderColor: UIColor.yellow).image!
 
 // Rounded Rects are all in style
-Toucan(image: landscapeCropped).maskWithRoundedRect(cornerRadius: 30).image
+Toucan(image: landscapeCropped).maskWithRoundedRect(cornerRadius: 30).image!
 
 // And can be fancy with borders
-Toucan(image: landscapeCropped).maskWithRoundedRect(cornerRadius: 30, borderWidth: 10, borderColor: UIColor.purple).image
+Toucan(image: landscapeCropped).maskWithRoundedRect(cornerRadius: 30, borderWidth: 10, borderColor: UIColor.purple).image!
 
 // Masking with an custom image mask
-Toucan(image: landscapeCropped).maskWithImage(maskImage: octagonMask!).image
+Toucan(image: landscapeCropped).maskWithImage(maskImage: octagonMask!).image!
 
 //testing the path stuff
 let path = UIBezierPath()
@@ -77,18 +77,18 @@ path.addLine(to: CGPoint(x: 50, y: 0))
 path.addLine(to: CGPoint(x: 100, y: 50))
 path.addLine(to: CGPoint(x: 50, y: 100))
 path.close()
-Toucan(image: landscapeCropped).maskWithPath(path: path).image
+Toucan(image: landscapeCropped).maskWithPath(path: path).image!
 
 Toucan(image: landscapeCropped).maskWithPathClosure(path: {(rect) -> (UIBezierPath) in
     return UIBezierPath(roundedRect: rect, cornerRadius: 50.0)
-}).image
+}).image!
 
 
 // ------------------------------------------------------------
 // Layers
 // ------------------------------------------------------------
 
 // We can draw ontop of another image
-Toucan(image: portraitImage!).layerWithOverlayImage(octagonMask!, overlayFrame: CGRect(x: 450, y: 400, width: 200, height: 200)).image
+Toucan(image: portraitImage!).layerWithOverlayImage(octagonMask!, overlayFrame: CGRect(x: 450, y: 400, width: 200, height: 200)).image!
 
 
diff --git a/ToucanPlayground.playground/timeline.xctimeline b/ToucanPlayground.playground/timeline.xctimeline
@@ -3,12 +3,12 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "file:///Users/gbunney/dev/Toucan/ToucanPlayground.playground#CharacterRangeLen=62&amp;CharacterRangeLoc=3428&amp;EndingColumnNumber=0&amp;EndingLineNumber=80&amp;StartingColumnNumber=1&amp;StartingLineNumber=79&amp;Timestamp=533352592.488941"
+         documentLocation = "file:///Users/gbunney/dev/Toucan/ToucanPlayground.playground#CharacterRangeLen=63&amp;CharacterRangeLoc=3434&amp;EndingColumnNumber=0&amp;EndingLineNumber=80&amp;StartingColumnNumber=1&amp;StartingLineNumber=79&amp;Timestamp=533378462.520809"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "file:///Users/gbunney/dev/Toucan/ToucanPlayground.playground#CharacterRangeLen=158&amp;CharacterRangeLoc=3492&amp;EndingColumnNumber=0&amp;EndingLineNumber=84&amp;StartingColumnNumber=1&amp;StartingLineNumber=81&amp;Timestamp=533352592.489106"
+         documentLocation = "file:///Users/gbunney/dev/Toucan/ToucanPlayground.playground#CharacterRangeLen=159&amp;CharacterRangeLoc=3499&amp;EndingColumnNumber=0&amp;EndingLineNumber=84&amp;StartingColumnNumber=1&amp;StartingLineNumber=81&amp;Timestamp=533378462.520995"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>