Migrated to Xcode 7 and Swift 2.0

Author: artman

.travis.yml

@@ -1,8 +1,21 @@
 language: objective-c
-xcode_project: Geometry.xcodeproj
-xcode_scheme: Geometry
-osx_image: xcode6.4
-xcode_sdk: iphonesimulator8.4
+osx_image: xcode7
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  matrix:
+    - DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="Geometry" SDK=iphonesimulator9.0
+    - DESTINATION="OS=8.2,name=iPhone 5" SCHEME="Geometry" SDK=iphonesimulator9.0
+    - DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="Geometry" SDK=iphonesimulator9.0
+    - DESTINATION="OS=8.4,name=iPhone 6" SCHEME="Geometry" SDK=iphonesimulator9.0
+    - DESTINATION="OS=9.0,name=iPhone 6 Plus" SCHEME="Geometry" SDK=iphonesimulator9.0
+script:
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -project Geometry.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION"
+    -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
 notifications:
   email: false
 
+

Geometry.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'Geometry'
-  s.version = '1.0.0'
+  s.version = '2.0.0'
   s.license = 'MIT'
   s.summary = 'Geometry is a UIView and CGRect extension that lets you work with view and rect geometry easier.'
   s.homepage = 'https://github.com/artman/Geometry'

Geometry.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		7207F69D1BC076E20018256C /* Geometry.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Geometry.podspec; sourceTree = "<group>"; };
 		72879CB819BD1F3B0015F977 /* Geometry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Geometry.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		72879CBC19BD1F3B0015F977 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		72879CBD19BD1F3B0015F977 /* Geometry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Geometry.h; sourceTree = "<group>"; };
@@ -47,13 +48,22 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		72879CAE19BD1F3A0015F977 = {
+		7207F69C1BC076D40018256C /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				72A3F8181B818B02003A946C /* UIKit.framework */,
 				72A3F8161B818AFD003A946C /* Foundation.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		72879CAE19BD1F3A0015F977 = {
+			isa = PBXGroup;
+			children = (
+				7207F69D1BC076E20018256C /* Geometry.podspec */,
 				72879CBA19BD1F3B0015F977 /* Geometry */,
 				72879CC419BD1F3B0015F977 /* GeometryTests */,
+				7207F69C1BC076D40018256C /* Frameworks */,
 				72879CB919BD1F3B0015F977 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -157,7 +167,7 @@
 		72879CAF19BD1F3A0015F977 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0600;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Tuomas Artman";
 				TargetAttributes = {
 					72879CB719BD1F3A0015F977 = {
@@ -245,6 +255,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -320,6 +331,7 @@
 				INFOPLIST_FILE = Geometry/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "artman.fi.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -337,6 +349,7 @@
 				INFOPLIST_FILE = Geometry/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "artman.fi.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -345,29 +358,23 @@
 		72879CCF19BD1F3B0015F977 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = GeometryTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "artman.fi.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
 		};
 		72879CD019BD1F3B0015F977 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
 				INFOPLIST_FILE = GeometryTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "artman.fi.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

Geometry.xcodeproj/xcshareddata/xcschemes/Geometry.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,15 +48,18 @@
             ReferencedContainer = "container:Geometry.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -71,10 +74,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference

Geometry/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>artman.fi.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

GeometryTests/GeometryTests.swift

@@ -47,7 +47,7 @@ class GeometryTests: XCTestCase {
     }
 
     func testUIView() {
-        var view = UIView(frame: "10, 10, 20, 20")
+        let view = UIView(frame: "10, 10, 20, 20")
 
         view.top += 5
         XCTAssertEqual(view.frame, CGRect(x: 10, y: 15, width: 20, height: 20), "Should modified rect correctly")
@@ -87,14 +87,14 @@ class GeometryTests: XCTestCase {
         XCTAssertEqual(rect, CGRect(x: 10, y: 20, width: 50, height: 60), "Should have create from string")
 
         let view = UIView(frame: "{{10, 20}, {50, 60}}")
-        XCTAssertEqual(rect, CGRect(x: 10, y: 20, width: 50, height: 60), "Should have create from string")
+        XCTAssertEqual(view.frame, CGRect(x: 10, y: 20, width: 50, height: 60), "Should have create from string")
     }
 
     func testPointStringConversion() {
-        var point: CGPoint = "10, 20"
+        let point: CGPoint = "10, 20"
         XCTAssertEqual(point, CGPoint(x: 10, y: 20), "Should have create from string")
 
-        var view = UIView(frame: "0, 0, 10, 10");
+        let view = UIView(frame: "0, 0, 10, 10");
         view.center = "10, 10"
         XCTAssertEqual(view.frame, CGRect(x: 5, y: 5, width: 10, height: 10), "Should have create from string")
     }

GeometryTests/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>artman.fi.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>