From 7a6cddc0a001a1678afc098813c427e4e3f25742 Mon Sep 17 00:00:00 2001 From: RomanTysiachnik Date: Mon, 21 Jan 2019 21:32:53 +0200 Subject: [PATCH] Updated podspec and bumped to swift 4.2 --- .github/REQUIREMENTS.md | 3 ++- .swift-version | 1 - .travis.yml | 4 ++-- Cartfile | 2 +- Cartfile.resolved | 2 +- SnappyShrimp.podspec | 10 ++++----- SnappyShrimp.xcodeproj/project.pbxproj | 22 +++++++++++-------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++++ .../xcschemes/SnappyShrimp.xcscheme | 4 +--- .../xcschemes/SnappyShrimpRecord.xcscheme | 4 +--- .../xcschemes/SnappyShrimpTests.xcscheme | 4 +--- SnappyShrimp/Sources/Info.plist | 2 +- 12 files changed, 36 insertions(+), 30 deletions(-) delete mode 100644 .swift-version create mode 100644 SnappyShrimp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.github/REQUIREMENTS.md b/.github/REQUIREMENTS.md index 6d8c9a5..b0bb977 100644 --- a/.github/REQUIREMENTS.md +++ b/.github/REQUIREMENTS.md @@ -2,7 +2,8 @@ ## List of the updates that should've been done -- [ ] Cocoapods support; +- [x] Cocoapods support; +- [ ] Tests autorecord support - [ ] New core instead FBSnapshotTestCase, that will also include new features, like: - Customizable export path and naming; - Add ability to use old API (UIGraphicsBeginImageWithContext) and the new one for iOS 10.0+ (UIGraphicsRenderer); diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 7d5c902..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -4.1 diff --git a/.travis.yml b/.travis.yml index a8a74ef..655a4df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ -language: swift -osx_image: xcode9.2 +osx_image: xcode10.1 xcode_project: SnappyShrimp before_install: @@ -9,3 +8,4 @@ before_install: script: - bundle exec fastlane test +- pod spec lint --allow-warnings \ No newline at end of file diff --git a/Cartfile b/Cartfile index c385cbb..ca93103 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "facebook/ios-snapshot-test-case" +github "uber/ios-snapshot-test-case" diff --git a/Cartfile.resolved b/Cartfile.resolved index ad423d2..c6bbb7c 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "facebook/ios-snapshot-test-case" "2.1.4" +github "uber/ios-snapshot-test-case" "5.0.2" diff --git a/SnappyShrimp.podspec b/SnappyShrimp.podspec index fc94cae..9e83ea8 100644 --- a/SnappyShrimp.podspec +++ b/SnappyShrimp.podspec @@ -1,9 +1,9 @@ Pod::Spec.new do |s| s.name = 'SnappyShrimp' - s.version = '1.6' + s.version = '1.6.2' s.summary = 'New experience of Snapshot testing' s.platform = :ios - s.swift_version = '4.1' + s.swift_version = '4.2' s.description = <<-DESC A new, faster way of Snapshot testing. Helps to verify that your view and its layout looks exactly as you expect on all devices, in all orientations, including iPad multitasking mode support and iPhone X support with its specific design. DESC @@ -16,8 +16,8 @@ A new, faster way of Snapshot testing. Helps to verify that your view and its la s.ios.deployment_target = '9.0' - s.source_files = 'SnappyShrimp/Sources/**/*' + s.source_files = 'SnappyShrimp/Sources/**/*.swift' s.resources = 'SnappyShrimp/Media.xcassets' s.frameworks = 'UIKit', 'XCTest' - s.dependency 'FBSnapshotTestCase', '~> 2.1.4' -end + s.dependency 'iOSSnapshotTestCase', '~> 5.0' +end \ No newline at end of file diff --git a/SnappyShrimp.xcodeproj/project.pbxproj b/SnappyShrimp.xcodeproj/project.pbxproj index 9e2321d..9f278be 100644 --- a/SnappyShrimp.xcodeproj/project.pbxproj +++ b/SnappyShrimp.xcodeproj/project.pbxproj @@ -287,7 +287,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Andrey Doroshko"; TargetAttributes = { 06F6C65C1FF3FE6F00E055F0 = { @@ -413,14 +413,14 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 95F456P57Y; + DEVELOPMENT_TEAM = KYF8QFK3G9; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; INFOPLIST_FILE = SnappyShrimpTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = personal.SnappyShrimpTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -429,14 +429,14 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 95F456P57Y; + DEVELOPMENT_TEAM = KYF8QFK3G9; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS"; INFOPLIST_FILE = SnappyShrimpTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = personal.SnappyShrimpTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -455,6 +455,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -462,6 +463,7 @@ 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; @@ -515,6 +517,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -522,6 +525,7 @@ 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; @@ -562,7 +566,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 95F456P57Y; + DEVELOPMENT_TEAM = KYF8QFK3G9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -578,7 +582,7 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -590,7 +594,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 95F456P57Y; + DEVELOPMENT_TEAM = KYF8QFK3G9; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -605,7 +609,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.RomanTysiachnik.SnappyShrimp; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/SnappyShrimp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SnappyShrimp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SnappyShrimp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimp.xcscheme b/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimp.xcscheme index f02142c..512ce85 100644 --- a/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimp.xcscheme +++ b/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimp.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimpRecord.xcscheme b/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimpRecord.xcscheme index f288c74..db847fa 100644 --- a/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimpRecord.xcscheme +++ b/SnappyShrimp.xcodeproj/xcshareddata/xcschemes/SnappyShrimpRecord.xcscheme @@ -1,6 +1,6 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.7 + 1.6.3 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass