Merge pull request #9 from the-grid/swift-2.2

Swift 2.2
the-grid · Apr 5, 2016 · e249181 · e249181
2 parents 95c9dae + 9983974
commit e249181
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/GridLogo.xcodeproj/project.pbxproj b/GridLogo.xcodeproj/project.pbxproj
@@ -385,10 +385,7 @@
 		01F378211B3F13DA0028211B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -403,10 +400,7 @@
 		01F378221B3F13DA0028211B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = GridLogoTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.thegrid.grid.$(PRODUCT_NAME:rfc1034identifier)";

diff --git a/GridLogo/GridAnimatedLogo.swift b/GridLogo/GridAnimatedLogo.swift
@@ -96,7 +96,7 @@ public class AnimatedGridLogo: UIView {
             let path = UIBezierPath()
             path.moveToPoint(curr)
 
-            for var i=0; i < turns; i++ {
+            for i in 0 ..< turns {
                 scalestep = round((CGFloat(i) + 1) / 2.0) * CGFloat(md)
                 curr = CGPoint(x: CGFloat(last.x) + (scalestep * CGFloat(xstep[i % 4])), y: CGFloat(last.y) + (scalestep * CGFloat(ystep[i % 4]))).toInt()
 

diff --git a/GridLogo/Info.plist b/GridLogo/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.09</string>
+	<string>2.00</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>0</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>