Merge branch 'release/1.0.1'

Digipolitan · Nov 2, 2017 · 03e3670 · 03e3670
2 parents eff8b81 + 3a6c4c8
commit 03e3670
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,6 @@ before_install:
   - gem install bundler
   - brew update
   - bundle install && brew bundle
-  - bundle exec pod repo update --silent
-script:
-  - bundle exec fastlane run_tests
-after_success:
-  - bundle exec fastlane ci_framework_deploy
+install: bundle exec pod install --repo-update --silent
+script: bundle exec fastlane run_tests
+after_success: bundle exec fastlane ci_framework_deploy
diff --git a/Sources/SplashNavigationController.swift b/Sources/SplashNavigationController.swift
@@ -59,13 +59,15 @@ public class SplashNavigationController: UINavigationController {
         self.isNavigationBarHidden = true
     }
 
+    #if os(iOS)
     public override var childViewControllerForStatusBarStyle: UIViewController? {
         return self.visibleViewController
     }
 
     public override var childViewControllerForStatusBarHidden: UIViewController? {
         return self.visibleViewController
     }
+    #endif
 }
 
 open class SplashViewController: UIViewController {