Merge pull request bannzai#120 from kishikawakatsumi/test-xcode8

Execute some tests on Xcode 8 in addition to Xcode 9

Author: kishikawakatsumi

.travis.yml

@@ -1,5 +1,4 @@
 language: objective-c
-osx_image: xcode9
 cache:
   directories:
   - build
@@ -9,12 +8,14 @@ cache:
 jobs:
   include:
   - stage: build
+    osx_image: xcode9
     install:
     - bundle install --path=vendor/bundle --binstubs=vendor/bin
     script:
     - bundle exec rake build-for-testing:simulator
   - &test
-    stage: test
+    stage: 'test (xcode9)'
+    osx_image: xcode9
     script:
     - bundle exec rake test-without-building:simulator
       DESTINATIONS="['name=iPhone 4s,OS=9.3']"
@@ -68,7 +69,27 @@ jobs:
     script:
     - bundle exec rake test-without-building:simulator
       DESTINATIONS="['name=iPad 2,OS=9.3']" TESTCASE='SelectionTests'
+  - stage: 'test (xcode8.3)'
+    osx_image: xcode8.3
+    script:
+    - bundle exec rake test:simulator DESTINATIONS="['name=iPhone 4s,OS=9.3']"
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -f 'coverage.txt'
+  - stage: 'test (xcode8.3)'
+    osx_image: xcode8.3
+    script:
+    - bundle exec rake test:simulator DESTINATIONS="['name=iPhone 7,OS=10.3.1']"
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -f 'coverage.txt'
+  - stage: carthage
+    osx_image: xcode9
+    install:
+    - brew update
+    - brew outdated carthage || brew upgrade carthage
+    script:
+    - carthage build --no-skip-current
   - stage: carthage
+    osx_image: xcode8.3
     install:
     - brew update
     - brew outdated carthage || brew upgrade carthage

Framework/Tests/HelperFunctions.swift

@@ -44,7 +44,11 @@ func showViewController(viewController: UIViewController) {
 func numberOfVisibleColumns(in view: SpreadsheetView, contentOffset: CGPoint = CGPoint.zero, parameters: Parameters) -> Int {
     let contentInset: UIEdgeInsets
     if #available(iOS 11.0, *) {
+        #if swift(>=3.2)
         contentInset = view.adjustedContentInset
+        #else
+        fatalError("unreachable code")
+        #endif
     } else {
         contentInset = view.contentInset
     }
@@ -70,7 +74,11 @@ func numberOfVisibleColumns(in view: SpreadsheetView, contentOffset: CGPoint = C
 func numberOfVisibleRows(in view: SpreadsheetView, contentOffset: CGPoint = CGPoint.zero, parameters: Parameters) -> Int {
     let contentInset: UIEdgeInsets
     if #available(iOS 11.0, *) {
+        #if swift(>=3.2)
         contentInset = view.adjustedContentInset
+        #else
+        fatalError("unreachable code")
+        #endif
     } else {
         contentInset = view.contentInset
     }

Framework/Tests/ViewTests.swift

@@ -136,11 +136,13 @@ class ViewTests: XCTestCase {
 
         XCTAssertEqual(spreadsheetView.frame, spreadsheetView.window!.frame)
         if #available(iOS 11.0, *) {
+            #if swift(>=3.2)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.top,
                            UIApplication.shared.statusBarFrame.height + viewController.navigationController!.navigationBar.frame.height)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.left, 0)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.right, 0)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.bottom, 0)
+            #endif
 
             XCTAssertEqual(spreadsheetView.contentInset, .zero)
         } else {
@@ -173,11 +175,13 @@ class ViewTests: XCTestCase {
 
         XCTAssertEqual(spreadsheetView.frame, spreadsheetView.window!.frame)
         if #available(iOS 11.0, *) {
+            #if swift(>=3.2)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.top,
                            UIApplication.shared.statusBarFrame.height + viewController.navigationController!.navigationBar.frame.height)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.left, 0)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.right, 0)
             XCTAssertEqual(spreadsheetView.adjustedContentInset.bottom, viewController.tabBarController!.tabBar.frame.height)
+            #endif
 
             XCTAssertEqual(spreadsheetView.contentInset, .zero)
         } else {
@@ -208,9 +212,11 @@ class ViewTests: XCTestCase {
 
         XCTAssertEqual(spreadsheetView.frame, spreadsheetView.window!.frame)
         XCTAssertEqual(spreadsheetView.contentInset, .zero)
+        #if swift(>=3.2)
         if #available(iOS 11.0, *) {
             XCTAssertEqual(spreadsheetView.adjustedContentInset, .zero)
         }
+        #endif
     }
 
     func testReloading() {

Gemfile.lock

@@ -12,4 +12,4 @@ DEPENDENCIES
   xcjobs
 
 BUNDLED WITH
-   1.15.0
+   1.15.3

Rakefile

@@ -11,13 +11,16 @@ namespace :test do
     t.scheme = 'SpreadsheetView'
     t.sdk = 'iphonesimulator'
     t.configuration = configuration
-    
+
     destinations.each { |destination| t.add_destination(destination) }
     t.add_only_testing("SpreadsheetViewTests/#{testcase}") if testcase
     t.add_build_option('-enableCodeCoverage', 'YES')
     t.add_build_setting('ENABLE_TESTABILITY', 'YES')
     t.add_build_setting('ONLY_ACTIVE_ARCH', 'NO')
     t.build_dir = 'build'
+    t.after_action do
+      build_coverage_reports()
+    end
   end
 
   desc 'test on device'
@@ -74,7 +77,7 @@ end
 
 def build_coverage_reports()
   project_name = 'SpreadsheetView'
-  profdata = Dir.glob(File.join('build', '/**/Coverage.profdata')).first  
+  profdata = Dir.glob(File.join('build', '/**/Coverage.profdata')).first
   Dir.glob(File.join('build', "/**/#{project_name}")) do |target|
     output = `xcrun llvm-cov report -instr-profile "#{profdata}" "#{target}" -arch=x86_64`
     if $?.success?