Merge pull request #16 from tonyarnold/task/reformat-source

Reformat source code, and update test target

Author: wokalski

.travis.yml

@@ -1,10 +1,49 @@
 osx_image: xcode8.2
 language: objective-c
-xcode_project: Diff.xcodeproj
-xcode_scheme: Diff-Mac
-install:
-  - gem install xcpretty
-git:
-   depth: 3
+
+before_install:
+    - gem install cocoapods # Since Travis is not always on latest version
+    - gem install xcpretty
+
+env:
+    global:
+        - LANG=en_US.UTF-8
+
+        - PROJECT="Diff.xcodeproj"
+        - SCHEME="Diff"
+
+        - IOS_SDK=iphonesimulator10.2
+        - OSX_SDK=macosx10.12
+        - TVOS_SDK=appletvsimulator10.1
+        - WATCHOS_SDK=watchsimulator3.1
+
+    matrix:
+        - DESTINATION="OS=9.0,name=iPhone 6" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
+        - DESTINATION="OS=9.1,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="NO"
+        - DESTINATION="OS=9.2,name=iPhone 6s Plus" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="NO"
+        - DESTINATION="OS=9.3,name=iPad Pro" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="NO"
+        - DESTINATION="OS=10.0,name=iPad Pro (12.9 inch)" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="NO"
+        - DESTINATION="OS=10.1,name=iPhone 7" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
+        - DESTINATION="OS=10.2,name=iPad Air 2" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
+
+        - DESTINATION="arch=x86_64" SDK="$OSX_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
+
+        - DESTINATION="OS=10.0,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
+        - DESTINATION="OS=10.1,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
+
+        - DESTINATION="OS=3.1,name=Apple Watch - 42mm" SDK="$WATCHOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
+
 script:
-    - set -o pipefail && xcodebuild -project Diff.xcodeproj -scheme DiffTests test | xcpretty
+    - set -o pipefail
+
+    - if [ $POD_LINT == "YES" ]; then pod lib lint; fi
+
+    - if [ $BUILD_EXAMPLE == "YES" ]; then xcodebuild clean build -project Examples/TableViewExample/TableViewExample.xcodeproj -scheme TableViewExample -sdk "$SDK" -destination "$DESTINATION" | xcpretty -c; fi
+
+    - if [ $RUN_TESTS == "YES" ]; then xcodebuild clean test -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c; fi
+    - if [ $RUN_TESTS != "YES" ]; then xcodebuild clean build -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c; fi
+
+    - swift build
+
+after_success:
+   - bash <(curl -s https://codecov.io/bash)

Configurations/Deployment-Targets.xcconfig

@@ -0,0 +1,4 @@
+IPHONEOS_DEPLOYMENT_TARGET = 8.0
+MACOSX_DEPLOYMENT_TARGET = 10.10
+TVOS_DEPLOYMENT_TARGET = 9.0
+WATCHOS_DEPLOYMENT_TARGET = 3.0

Configurations/Universal-Framework-Target.xcconfig

@@ -0,0 +1,25 @@
+#include "Universal-Target-Base.xcconfig"
+
+// OSX-specific default settings
+FRAMEWORK_VERSION[sdk=macosx*]                = A
+COMBINE_HIDPI_IMAGES[sdk=macosx*]             = YES
+
+// iOS-specific default settings
+TARGETED_DEVICE_FAMILY[sdk=iphonesimulator*]  = 1,2
+TARGETED_DEVICE_FAMILY[sdk=iphone*]           = 1,2
+
+// TV-specific default settings
+TARGETED_DEVICE_FAMILY[sdk=appletvsimulator*] = 3
+TARGETED_DEVICE_FAMILY[sdk=appletv*]          = 3
+
+// Watch-specific default settings
+TARGETED_DEVICE_FAMILY[sdk=watchsimulator*]   = 4
+TARGETED_DEVICE_FAMILY[sdk=watch*]            = 4
+
+ENABLE_BITCODE[sdk=macosx*]                   = NO
+ENABLE_BITCODE[sdk=watchsimulator*]           = YES
+ENABLE_BITCODE[sdk=watch*]                    = YES
+ENABLE_BITCODE[sdk=iphonesimulator*]          = NO
+ENABLE_BITCODE[sdk=iphone*]                   = YES
+ENABLE_BITCODE[sdk=appletvsimulator*]         = YES
+ENABLE_BITCODE[sdk=appletv*]                  = YES

Configurations/Universal-Target-Base.xcconfig

@@ -0,0 +1,18 @@
+SUPPORTED_PLATFORMS                    = macosx iphonesimulator iphoneos watchos watchsimulator appletvos appletvsimulator
+VALID_ARCHS[sdk=macosx*]               = i386 x86_64
+VALID_ARCHS[sdk=iphoneos*]             = arm64 armv7 armv7s
+VALID_ARCHS[sdk=iphonesimulator*]      = i386 x86_64
+VALID_ARCHS[sdk=watchos*]              = armv7k
+VALID_ARCHS[sdk=watchsimulator*]       = i386
+VALID_ARCHS[sdk=appletv*]              = arm64
+VALID_ARCHS[sdk=appletvsimulator*]     = x86_64
+
+// Dynamic linking uses different default copy paths
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]           = $(inherited) '@executable_path/../Frameworks' '@loader_path/../Frameworks'
+LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*]         = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*]  = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+LD_RUNPATH_SEARCH_PATHS[sdk=watchos*]          = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+LD_RUNPATH_SEARCH_PATHS[sdk=watchsimulator*]   = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*]        = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
+