This repository has been archived by the owner on Nov 26, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 772
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from FolioReader/master
Merge from official
- Loading branch information
Showing
56 changed files
with
1,740 additions
and
1,176 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,13 @@ | ||
osx_image: xcode8.1 | ||
osx_image: xcode9.2 | ||
language: objective-c | ||
cache: | ||
- cocoapods | ||
|
||
cache: cocoapods | ||
podfile: Example/Podfile | ||
|
||
before_install: | ||
- gem install cocoapods # Since Travis is not always on latest version | ||
- pod repo update | ||
- pod install --project-directory=Example | ||
|
||
script: | ||
- set -o pipefail && xcodebuild test -workspace Example/Example.xcworkspace -scheme Example -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1' | xcpretty | ||
# - pod lib lint --allow-warnings | ||
- set -o pipefail && xcodebuild test -workspace Example/Example.xcworkspace -scheme Example -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' | xcpretty | ||
# - pod lib lint --allow-warnings |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
github "ZipArchive/ZipArchive" ~> 1.6 | ||
github "cxa/MenuItemKit" == 2.0 | ||
github "ZipArchive/ZipArchive" == 2.1.1 | ||
github "cxa/MenuItemKit" == 3.0.0 | ||
github "alexpopov/ZFDragableModalTransition" "merge-carthage-into-zoonooz" | ||
github "tadija/AEXML" == 4.0 | ||
github "ArtSabintsev/FontBlaster" == 3.0.0 | ||
github "jessesquires/JSQWebViewController" ~> 5.0 | ||
github "realm/realm-cocoa" ~> 3.0.2 | ||
github "tadija/AEXML" == 4.2.2 | ||
github "ArtSabintsev/FontBlaster" == 4.0.1 | ||
github "jessesquires/JSQWebViewController" == 6.0.0 | ||
github "realm/realm-cocoa" == 3.1.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
github "tadija/AEXML" "4.0.0" | ||
github "ArtSabintsev/FontBlaster" "3.0.0" | ||
github "jessesquires/JSQWebViewController" "5.0.0" | ||
github "cxa/MenuItemKit" "2.0" | ||
github "ArtSabintsev/FontBlaster" "4.0.1" | ||
github "ZipArchive/ZipArchive" "v2.1.1" | ||
github "alexpopov/ZFDragableModalTransition" "8da951efb4202385630d1cf7104b60d1208f807e" | ||
github "ZipArchive/ZipArchive" "v1.8.1" | ||
github "realm/realm-cocoa" "v3.0.2" | ||
github "cxa/MenuItemKit" "3.0.0" | ||
github "jessesquires/JSQWebViewController" "6.0.0" | ||
github "realm/realm-cocoa" "v3.1.1" | ||
github "tadija/AEXML" "4.2.2" |
Oops, something went wrong.