Skip to content
This repository has been archived by the owner on Nov 26, 2020. It is now read-only.

Commit

Permalink
Changed dependencies to work with iOS 12.1 and Xcode 10.1 (#377)
Browse files Browse the repository at this point in the history
* Changed dependencies to work with iOS 12.1 and xCode 10.1

* updated dependencies to work with latest Xcode (10.1) and iOS (12.1)

* Update .travis.yml

* updated tests to latest iOS

* Updated tests (Nimble and Quick) to latest versions

* Updated .travis.yml to latest test

* Fixed a thread lock issue causing example to Example to
crash

* Updated dependencies to latest to work with Xcode 10.1 on iOS 12.1

* Conversion to Swift 4.2 and fixed FolioReaderAudioPlayer AudioIssue

* updated xcode workspace

* Configured project to build correctly after Swift 4.2 conversion

* Pointing JSQ to forked repo containing Swift 4.2 fix

* modified pod dependency to natively support 4.2 by using branched JSQ

* build now under examples
  • Loading branch information
fantim authored and hebertialmeida committed Jan 30, 2019
1 parent 707aee3 commit e34546e
Show file tree
Hide file tree
Showing 39 changed files with 318 additions and 301 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
osx_image: xcode9.2
osx_image: xcode10.1
language: objective-c
cache: cocoapods
podfile: Example/Podfile
Expand All @@ -9,5 +9,5 @@ before_install:
- pod install --project-directory=Example

script:
- set -o pipefail && xcodebuild test -workspace Example/Example.xcworkspace -scheme Example -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.2' | xcpretty
- set -o pipefail && xcodebuild test -workspace Example/Example.xcworkspace -scheme Example -destination 'platform=iOS Simulator,name=iPhone X,OS=12.1' | xcpretty
# - pod lib lint --allow-warnings
10 changes: 5 additions & 5 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "ZipArchive/ZipArchive" == 2.1.1
github "cxa/MenuItemKit" == 3.0.0
github "cxa/MenuItemKit" == 3.1.3
github "alexpopov/ZFDragableModalTransition" "merge-carthage-into-zoonooz"
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
github "tadija/AEXML" == 4.3.3
github "ArtSabintsev/FontBlaster" == 4.1.0
github "fantim/JSQWebViewController" == 6.1.1
github "realm/realm-cocoa" == 3.13.1
10 changes: 5 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "ArtSabintsev/FontBlaster" "4.0.1"
github "ArtSabintsev/FontBlaster" "4.1.0"
github "ZipArchive/ZipArchive" "v2.1.1"
github "alexpopov/ZFDragableModalTransition" "8da951efb4202385630d1cf7104b60d1208f807e"
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"
github "cxa/MenuItemKit" "3.1.3"
github "fantim/JSQWebViewController" "6.0.0"
github "realm/realm-cocoa" "v3.13.1"
github "tadija/AEXML" "4.3.3"
54 changes: 23 additions & 31 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@
CA10C12F1C572A4B0049165D /* Resources */,
C1392FF51E4FD15EBB5AA8DD /* [CP] Embed Pods Frameworks */,
E82F486563C1547E0775A59F /* 📦 Embed Pods Frameworks */,
064D38CE83FACC358B7C0EC8 /* 📦 Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -371,13 +370,13 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1010;
ORGANIZATIONNAME = FolioReader;
TargetAttributes = {
1A42C2881C0E3882000F2137 = {
CreatedOnToolsVersion = 7.1.1;
DevelopmentTeam = 32F2T8EJ6G;
LastSwiftMigration = 0800;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
Expand All @@ -392,7 +391,7 @@
CA10C1301C572A4B0049165D = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = 99AHAA343Q;
LastSwiftMigration = 0800;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
TestTargetID = 1A42C2881C0E3882000F2137;
};
Expand Down Expand Up @@ -489,21 +488,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
064D38CE83FACC358B7C0EC8 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FolioReaderTests/Pods-FolioReaderTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
1D8126CC73301F2413345444 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -565,7 +549,7 @@
"${BUILT_PRODUCTS_DIR}/AEXML/AEXML.framework",
"${BUILT_PRODUCTS_DIR}/FolioReaderKit/FolioReaderKit.framework",
"${BUILT_PRODUCTS_DIR}/FontBlaster/FontBlaster.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewController/JSQWebViewController.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewControllerMod42/JSQWebViewControllerMod42.framework",
"${BUILT_PRODUCTS_DIR}/MenuItemKit/MenuItemKit.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
Expand All @@ -577,7 +561,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AEXML.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FolioReaderKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontBlaster.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewControllerMod42.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MenuItemKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
Expand All @@ -599,7 +583,7 @@
"${BUILT_PRODUCTS_DIR}/AEXML/AEXML.framework",
"${BUILT_PRODUCTS_DIR}/FolioReaderKit/FolioReaderKit.framework",
"${BUILT_PRODUCTS_DIR}/FontBlaster/FontBlaster.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewController/JSQWebViewController.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewControllerMod42/JSQWebViewControllerMod42.framework",
"${BUILT_PRODUCTS_DIR}/MenuItemKit/MenuItemKit.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
Expand All @@ -611,7 +595,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AEXML.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FolioReaderKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontBlaster.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewControllerMod42.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MenuItemKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
Expand All @@ -633,7 +617,7 @@
"${BUILT_PRODUCTS_DIR}/AEXML/AEXML.framework",
"${BUILT_PRODUCTS_DIR}/FolioReaderKit/FolioReaderKit.framework",
"${BUILT_PRODUCTS_DIR}/FontBlaster/FontBlaster.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewController/JSQWebViewController.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewControllerMod42/JSQWebViewControllerMod42.framework",
"${BUILT_PRODUCTS_DIR}/MenuItemKit/MenuItemKit.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
Expand All @@ -645,7 +629,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AEXML.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FolioReaderKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontBlaster.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewControllerMod42.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MenuItemKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
Expand All @@ -667,7 +651,7 @@
"${BUILT_PRODUCTS_DIR}/AEXML/AEXML.framework",
"${BUILT_PRODUCTS_DIR}/FolioReaderKit/FolioReaderKit.framework",
"${BUILT_PRODUCTS_DIR}/FontBlaster/FontBlaster.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewController/JSQWebViewController.framework",
"${BUILT_PRODUCTS_DIR}/JSQWebViewControllerMod42/JSQWebViewControllerMod42.framework",
"${BUILT_PRODUCTS_DIR}/MenuItemKit/MenuItemKit.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
Expand All @@ -681,7 +665,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AEXML.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FolioReaderKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontBlaster.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSQWebViewControllerMod42.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MenuItemKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
Expand Down Expand Up @@ -847,12 +831,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -879,12 +865,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -901,12 +887,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -927,11 +915,11 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
Expand All @@ -951,6 +939,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -968,6 +957,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand Down Expand Up @@ -1020,6 +1010,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.folioreader.FolioReaderTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
};
name = Debug;
Expand All @@ -1037,6 +1028,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.folioreader.FolioReaderTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
};
name = Release;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -56,7 +55,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion Example/Example/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import FolioReaderKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}
}
4 changes: 2 additions & 2 deletions Example/FolioReaderTests/FolioReaderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class FolioReaderTests: QuickSpec {

do {
let parsedImage = try subject.parseCoverImage(epubPath)
let data1 = UIImagePNGRepresentation(parsedImage)
let data2 = UIImagePNGRepresentation(fromFileImage)
let data1 = parsedImage.pngData()
let data2 = fromFileImage.pngData()
expect(data1).to(equal(data2))
} catch {
fail("Error: \(error.localizedDescription)")
Expand Down
4 changes: 2 additions & 2 deletions Example/FolioReaderTests/SharingProviderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SharingProviderTests: QuickSpec {
}

it("returns text for a mail activity") {
let itemForActivityType = subject.activityViewController(activityViewController, itemForActivityType: UIActivityType.mail) as? String
let itemForActivityType = subject.activityViewController(activityViewController, itemForActivityType: UIActivity.ActivityType.mail) as? String
expect(itemForActivityType).to(equal(subject.text))
}
}
Expand All @@ -41,7 +41,7 @@ class SharingProviderTests: QuickSpec {
}

it("returns HTML for a mail activity") {
let itemForActivityType = subject.activityViewController(activityViewController, itemForActivityType: UIActivityType.mail) as? String
let itemForActivityType = subject.activityViewController(activityViewController, itemForActivityType: UIActivity.ActivityType.mail) as? String
expect(itemForActivityType).to(equal(subject.html))
}
}
Expand Down
2 changes: 1 addition & 1 deletion Example/MultipleInstances-Example/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import FolioReaderKit
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
return true
}
}
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def shared_pods
end

def testing_pods
pod 'Quick', '1.2.0'
pod 'Nimble', '7.0.2'
pod 'Quick', '1.3.2'
pod 'Nimble', '7.3.1'
end

target 'Example' do
Expand Down
Loading

0 comments on commit e34546e

Please sign in to comment.