diff --git a/.travis.yml b/.travis.yml index 60a57b1..a140e77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,13 @@ # * https://github.com/supermarin/xcpretty#usage language: objective-c -osx_image: xcode10 +osx_image: xcode10.2 # cache: cocoapods # podfile: Example/Podfile before_install: -- gem install cocoapods -v 1.1.1 +- gem install cocoapods --no-document --quiet +- pod repo update - pod install --project-directory=Example script: diff --git a/Example/Gemfile b/Example/Gemfile index 69a2a02..ed940b3 100644 --- a/Example/Gemfile +++ b/Example/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'cocoapods', '1.2.0' -gem 'cocoapods-deintegrate', '1.0.1' +gem 'cocoapods', '1.7.0' +gem 'cocoapods-deintegrate', '1.0.4' diff --git a/Example/Gemfile.lock b/Example/Gemfile.lock index 54d757c..b0da17d 100644 --- a/Example/Gemfile.lock +++ b/Example/Gemfile.lock @@ -1,76 +1,77 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.5) - activesupport (4.2.7.1) + CFPropertyList (3.0.0) + activesupport (4.2.11) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (1.0.1) - cocoapods (1.2.0) + atomos (0.1.3) + claide (1.0.2) + cocoapods (1.7.0) activesupport (>= 4.0.2, < 5) - claide (>= 1.0.1, < 2.0) - cocoapods-core (= 1.2.0) - cocoapods-deintegrate (>= 1.0.1, < 2.0) - cocoapods-downloader (>= 1.1.3, < 2.0) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.7.0) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.1.2, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) - colored (~> 1.2) + colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.5.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 0.2.5) - xcodeproj (>= 1.4.1, < 2.0) - cocoapods-core (1.2.0) - activesupport (>= 4.0.2, < 5) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.2, < 2.0) + cocoapods-core (1.7.0) + activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.1) - cocoapods-downloader (1.1.3) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.1.2) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) - netrc (= 0.7.8) + netrc (~> 0.11) cocoapods-try (1.1.0) - colored (1.2) + colored2 (3.1.2) + concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) - gh_inspector (1.0.3) - i18n (0.8.0) - json (1.8.3) - minitest (5.10.1) - molinillo (0.5.6) - nanaimo (0.2.3) + gh_inspector (1.1.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + molinillo (0.6.6) + nanaimo (0.2.6) nap (1.1.0) - netrc (0.7.8) - ruby-macho (0.2.6) - thread_safe (0.3.5) - tzinfo (1.2.2) + netrc (0.11.0) + ruby-macho (1.4.0) + thread_safe (0.3.6) + tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.4.2) - CFPropertyList (~> 2.3.3) - activesupport (>= 3) - claide (>= 1.0.1, < 2.0) - colored (~> 1.2) - nanaimo (~> 0.2.3) + xcodeproj (1.9.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.2.0) - cocoapods-deintegrate (= 1.0.1) + cocoapods (= 1.7.0) + cocoapods-deintegrate (= 1.0.4) BUNDLED WITH - 1.14.4 + 1.16.2 diff --git a/Example/Podfile b/Example/Podfile index 5a6670c..5753d59 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,8 +1,8 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, '12.0' +platform :ios, '9.0' use_frameworks! target 'YoshiExample' do - pod "Instabug", '5.2.4' + pod "Instabug", '8.4.0' pod "Yoshi", :path => "../", :subspecs => ['QAKit'] end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 79fe9c0..fe7dddc 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,11 +1,11 @@ PODS: - - Instabug (5.2.4) + - Instabug (8.4) - Yoshi/Core (3.0.0) - Yoshi/QAKit (3.0.0): - Yoshi/Core DEPENDENCIES: - - Instabug (= 5.2.4) + - Instabug (= 8.4.0) - Yoshi/QAKit (from `../`) SPEC REPOS: @@ -17,9 +17,9 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Instabug: 6fa40a5e2a4620f0589dfc8e4e01b1018c8c42b1 - Yoshi: f681e9474a3d0aa8ec7ec935c579f52c2d00a360 + Instabug: 239a5252f9631054eadca55209598fdece82378e + Yoshi: 46935b08ce44f7db04508237c00a87e7bec8c6a8 -PODFILE CHECKSUM: 6937f5f3704e17fb013434d20f6bd261b2e48f51 +PODFILE CHECKSUM: 76f621644a9c4a867a3808ab14d80d7fa58ee9f0 -COCOAPODS: 1.5.3 +COCOAPODS: 1.7.0 diff --git a/Example/YoshiExample.xcodeproj/project.pbxproj b/Example/YoshiExample.xcodeproj/project.pbxproj index 6470c31..a92f522 100644 --- a/Example/YoshiExample.xcodeproj/project.pbxproj +++ b/Example/YoshiExample.xcodeproj/project.pbxproj @@ -7,19 +7,20 @@ objects = { /* Begin PBXBuildFile section */ + 13BA5D8DAEA14590148A1C02 /* Pods_YoshiExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C09C0E2E0B4C13F36B6C5825 /* Pods_YoshiExample.framework */; }; 276BCECF1C29F060002138C7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 276BCECE1C29F060002138C7 /* AppDelegate.swift */; }; 276BCED11C29F060002138C7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 276BCED01C29F060002138C7 /* ViewController.swift */; }; 276BCED41C29F060002138C7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 276BCED21C29F060002138C7 /* Main.storyboard */; }; 276BCED61C29F060002138C7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 276BCED51C29F060002138C7 /* Assets.xcassets */; }; 276BCED91C29F060002138C7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 276BCED71C29F060002138C7 /* LaunchScreen.storyboard */; }; 32CF65FF1F7B052F001A712A /* YoshiBaseEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32CF65FE1F7B0515001A712A /* YoshiBaseEnvironment.swift */; }; - 6A80770C715FF7079F982454 /* Pods_YoshiExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38AED69D51CB2462EC94055C /* Pods_YoshiExample.framework */; }; 94E2C9C11F081DDE00811CE9 /* DateSelectorMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E2C9C01F081DDE00811CE9 /* DateSelectorMenu.swift */; }; 94E2C9C91F081F5900811CE9 /* CustomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94E2C9C71F081F5900811CE9 /* CustomCell.xib */; }; 94E2C9CA1F081F5900811CE9 /* CustomUIMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94E2C9C81F081F5900811CE9 /* CustomUIMenu.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 01B7BF0C6570B4C2B4829DFF /* Pods-YoshiExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoshiExample.release.xcconfig"; path = "Target Support Files/Pods-YoshiExample/Pods-YoshiExample.release.xcconfig"; sourceTree = ""; }; 276BCECB1C29F060002138C7 /* YoshiExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YoshiExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 276BCECE1C29F060002138C7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 276BCED01C29F060002138C7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -29,13 +30,12 @@ 276BCEDA1C29F060002138C7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 27C7F7EB1CF51D4D0069687F /* YoshiExample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YoshiExample-Bridging-Header.h"; sourceTree = ""; }; 32CF65FE1F7B0515001A712A /* YoshiBaseEnvironment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YoshiBaseEnvironment.swift; sourceTree = ""; }; - 38AED69D51CB2462EC94055C /* Pods_YoshiExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YoshiExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4B69EFE97A45841AA3569F78 /* Pods-YoshiExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoshiExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample.release.xcconfig"; sourceTree = ""; }; - 611645F651489CBB0C351E8B /* Pods-YoshiExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoshiExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample.debug.xcconfig"; sourceTree = ""; }; + 9221715E04A3E52B19D0E3A8 /* Pods-YoshiExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YoshiExample.debug.xcconfig"; path = "Target Support Files/Pods-YoshiExample/Pods-YoshiExample.debug.xcconfig"; sourceTree = ""; }; 94E2C9C01F081DDE00811CE9 /* DateSelectorMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateSelectorMenu.swift; sourceTree = ""; }; 94E2C9C71F081F5900811CE9 /* CustomCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomCell.xib; sourceTree = ""; }; 94E2C9C81F081F5900811CE9 /* CustomUIMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomUIMenu.swift; sourceTree = ""; }; 9E459C63EB9049F862020412 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C09C0E2E0B4C13F36B6C5825 /* Pods_YoshiExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YoshiExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -43,7 +43,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6A80770C715FF7079F982454 /* Pods_YoshiExample.framework in Frameworks */, + 13BA5D8DAEA14590148A1C02 /* Pods_YoshiExample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -56,7 +56,7 @@ 276BCECD1C29F060002138C7 /* YoshiExample */, 276BCECC1C29F060002138C7 /* Products */, AE2190EAEAA3F1CB2B7915C9 /* Frameworks */, - B0BC1B6B07669C478A957533 /* Pods */, + A98685DCCEE6D1335D7FEB1C /* Pods */, ); sourceTree = ""; }; @@ -110,22 +110,22 @@ path = CustomUIMenu; sourceTree = ""; }; - AE2190EAEAA3F1CB2B7915C9 /* Frameworks */ = { + A98685DCCEE6D1335D7FEB1C /* Pods */ = { isa = PBXGroup; children = ( - 9E459C63EB9049F862020412 /* Pods.framework */, - 38AED69D51CB2462EC94055C /* Pods_YoshiExample.framework */, + 9221715E04A3E52B19D0E3A8 /* Pods-YoshiExample.debug.xcconfig */, + 01B7BF0C6570B4C2B4829DFF /* Pods-YoshiExample.release.xcconfig */, ); - name = Frameworks; + path = Pods; sourceTree = ""; }; - B0BC1B6B07669C478A957533 /* Pods */ = { + AE2190EAEAA3F1CB2B7915C9 /* Frameworks */ = { isa = PBXGroup; children = ( - 611645F651489CBB0C351E8B /* Pods-YoshiExample.debug.xcconfig */, - 4B69EFE97A45841AA3569F78 /* Pods-YoshiExample.release.xcconfig */, + 9E459C63EB9049F862020412 /* Pods.framework */, + C09C0E2E0B4C13F36B6C5825 /* Pods_YoshiExample.framework */, ); - name = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -135,12 +135,11 @@ isa = PBXNativeTarget; buildConfigurationList = 276BCEDD1C29F060002138C7 /* Build configuration list for PBXNativeTarget "YoshiExample" */; buildPhases = ( - A406AEF3198A3BAC81FB073C /* [CP] Check Pods Manifest.lock */, + FE478C59D23727E8EA42217C /* [CP] Check Pods Manifest.lock */, 276BCEC71C29F060002138C7 /* Sources */, 276BCEC81C29F060002138C7 /* Frameworks */, 276BCEC91C29F060002138C7 /* Resources */, - 9807FA47239685B35BD1B1CC /* [CP] Embed Pods Frameworks */, - 2FE9A2C899648AB92ACEAA90 /* [CP] Copy Pods Resources */, + C2852F3D87F4DC7BA9BB8CD6 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -158,12 +157,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Prolific Interactive"; TargetAttributes = { 276BCECA1C29F060002138C7 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; @@ -173,6 +172,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -201,52 +201,42 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2FE9A2C899648AB92ACEAA90 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-resources.sh", - "${PODS_ROOT}/Instabug/Instabug.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Instabug.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 9807FA47239685B35BD1B1CC /* [CP] Embed Pods Frameworks */ = { + C2852F3D87F4DC7BA9BB8CD6 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh", + "${PODS_ROOT}/Instabug/Instabug.framework", + "${PODS_ROOT}/Instabug/Instabug.framework.dSYM", "${BUILT_PRODUCTS_DIR}/Yoshi/Yoshi.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Instabug.framework", + "${DWARF_DSYM_FOLDER_PATH}/Instabug.framework.dSYM", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Yoshi.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YoshiExample/Pods-YoshiExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - A406AEF3198A3BAC81FB073C /* [CP] Check Pods Manifest.lock */ = { + FE478C59D23727E8EA42217C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( "${PODS_PODFILE_DIR_PATH}/Podfile.lock", "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); outputPaths = ( "$(DERIVED_FILE_DIR)/Pods-YoshiExample-checkManifestLockResult.txt", ); @@ -296,6 +286,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -304,12 +295,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; @@ -350,6 +343,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -358,12 +352,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; @@ -395,7 +391,7 @@ }; 276BCEDE1C29F060002138C7 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 611645F651489CBB0C351E8B /* Pods-YoshiExample.debug.xcconfig */; + baseConfigurationReference = 9221715E04A3E52B19D0E3A8 /* Pods-YoshiExample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -403,7 +399,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = YoshiExample/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.YoshiExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -411,14 +407,14 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "YoshiExample/YoshiExample-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 276BCEDF1C29F060002138C7 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4B69EFE97A45841AA3569F78 /* Pods-YoshiExample.release.xcconfig */; + baseConfigurationReference = 01B7BF0C6570B4C2B4829DFF /* Pods-YoshiExample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -427,14 +423,14 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = YoshiExample/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.YoshiExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "YoshiExample/YoshiExample-Bridging-Header.h"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Example/YoshiExample/AppDelegate.swift b/Example/YoshiExample/AppDelegate.swift index 96ae593..5170c47 100644 --- a/Example/YoshiExample/AppDelegate.swift +++ b/Example/YoshiExample/AppDelegate.swift @@ -64,13 +64,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } private func instabugMenu() -> YoshiMenu { - Instabug.start(withToken: "cf779d2e19c0affaad8567a7598e330d", invocationEvent: .none) - Instabug.setDefaultInvocationMode(.bugReporter) + Instabug.start(withToken: "cf779d2e19c0affaad8567a7598e330d", invocationEvents: [.none]) + BugReporting.promptOptionsEnabledReportTypes = [.bug] return YoshiActionMenu(title: "Start Instabug", subtitle: nil, completion: { - Instabug.invoke() + Instabug.show() }) } diff --git a/README.md b/README.md index c476076..6b55757 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Travis build status](https://img.shields.io/travis/prolificinteractive/Yoshi.svg?style=flat-square)](https://travis-ci.org/prolificinteractive/Yoshi) [![Cocoapods Compatible](https://img.shields.io/cocoapods/v/Yoshi.svg?style=flat-square)](https://img.shields.io/cocoapods/v/Yoshi.svg) [![Platform](https://img.shields.io/cocoapods/p/Yoshi.svg?style=flat-square)](http://cocoadocs.org/docsets/Yoshi) -[![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg?style=flat-square)](http://cocoadocs.org/docsets/Yoshi) +[![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg?style=flat-square)](http://cocoadocs.org/docsets/Yoshi) [![Docs](https://img.shields.io/cocoapods/metrics/doc-percent/Yoshi.svg?style=flat-square)](http://cocoadocs.org/docsets/Yoshi) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) @@ -21,8 +21,8 @@ Yoshi is a convenient wrapper around the UI code that is often needed for displa ## Requirements -* iOS 8.0+ -* Xcode 8.0+ +* iOS 9.0+ +* Xcode 10.2+ ## Installation @@ -30,12 +30,17 @@ Yoshi is a convenient wrapper around the UI code that is often needed for displa Yoshi is available through [CocoaPods](http://cocoapods.org). To install it, simply add the following line to your `Podfile`: -###### Swift 4.2 +###### Swift 5.0 ```ruby pod 'Yoshi' ``` +###### Swift 4.0 and 4.2 +```ruby +pod 'Yoshi', '3.0.0' +``` + ###### Swift 3.0 ```ruby @@ -93,7 +98,7 @@ For example, we can invoke [Instabug](https://instabug.com) when a custom menu i ```swift let instabugMenu = YoshiActionMenu(title: "Start Instabug", subtitle: nil, - completion: { Instabug.invoke() }) + completion: { Instabug.show() }) ``` ### Single Selection Menu @@ -299,7 +304,7 @@ If you wish to contribute to the project, fork this repo and submit a pull reque ![prolific](https://s3.amazonaws.com/prolificsitestaging/logos/Prolific_Logo_Full_Color.png) -Copyright (c) 2017 Prolific Interactive +Copyright (c) 2019 Prolific Interactive Yoshi is maintained and sponsored by Prolific Interactive. It may be redistributed under the terms specified in the [LICENSE] file. diff --git a/Yoshi.podspec b/Yoshi.podspec index 41917e5..6c4e95c 100644 --- a/Yoshi.podspec +++ b/Yoshi.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "Yoshi" - s.version = "3.0.0" + s.version = "3.0.1" s.summary = "A helpful companion for your iOS app." # This description is used to generate tags and improve search results. @@ -26,7 +26,7 @@ Pod::Spec.new do |s| s.author = { "Michael Campbell" => "Michael@prolificinteractive.com" , "Luna An" => "luna@prolificinteractive.com"} s.source = { :git => "https://github.com/prolificinteractive/Yoshi.git", :tag => s.version.to_s } - s.platform = :ios, '8.0' + s.platform = :ios, '9.0' s.requires_arc = true # Default subspec that contains all shared code files for the library diff --git a/Yoshi/Yoshi.xcodeproj/project.pbxproj b/Yoshi/Yoshi.xcodeproj/project.pbxproj index f42c373..d0dd997 100644 --- a/Yoshi/Yoshi.xcodeproj/project.pbxproj +++ b/Yoshi/Yoshi.xcodeproj/project.pbxproj @@ -348,25 +348,26 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "Prolific Interactive"; TargetAttributes = { 276BCEA01C29A6EF002138C7 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; 276BCEAA1C29A6EF002138C7 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0900; + LastSwiftMigration = 1020; }; }; }; buildConfigurationList = 276BCE9B1C29A6EF002138C7 /* Build configuration list for PBXProject "Yoshi" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 276BCE971C29A6EF002138C7; productRefGroup = 276BCEA21C29A6EF002138C7 /* Products */; @@ -455,6 +456,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -463,12 +465,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; @@ -501,6 +505,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -511,6 +516,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -519,12 +525,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; @@ -550,6 +558,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -573,8 +582,6 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -593,8 +600,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.Yoshi; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -605,8 +610,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.YoshiTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -617,8 +620,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.prolificinteractive.YoshiTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Yoshi/Yoshi.xcodeproj/xcshareddata/xcschemes/Yoshi.xcscheme b/Yoshi/Yoshi.xcodeproj/xcshareddata/xcschemes/Yoshi.xcscheme index 92b844d..4e4b014 100644 --- a/Yoshi/Yoshi.xcodeproj/xcshareddata/xcschemes/Yoshi.xcscheme +++ b/Yoshi/Yoshi.xcodeproj/xcshareddata/xcschemes/Yoshi.xcscheme @@ -1,6 +1,6 @@