diff --git a/.circleci/config.yml b/.circleci/config.yml index 389b1ed8..41c085de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,15 +4,16 @@ executors: ios12-iphone-xs-max: macos: - xcode: 10.1.0 + xcode: 10.2.0 shell: /bin/bash --login -eo pipefail environment: - DESTINATION: platform=iOS Simulator,OS=12.1,name=iPhone XS Max - SIMULATOR: iPhone XS Max (12.0) [ + SIMULATOR_OS: 12.2 + DESTINATION: platform=iOS Simulator,OS=12.2,name=iPhone XS Max + SIMULATOR: iPhone XS Max (12.2) [ ios11-iphone-x: macos: - xcode: 10.1.0 + xcode: 10.2.0 shell: /bin/bash --login -eo pipefail environment: DESTINATION: platform=iOS Simulator,OS=11.2,name=iPhone X @@ -20,7 +21,7 @@ executors: ios10-iphone-7: macos: - xcode: 10.1.0 + xcode: 10.2.0 shell: /bin/bash --login -eo pipefail environment: DESTINATION: platform=iOS Simulator,OS=10.3.1,name=iPhone 7 @@ -33,7 +34,7 @@ commands: description: Update bundler to newest version steps: - run: - name: Update bunder + name: Update bundler command: gem install bundler restore-gem-cache: @@ -229,7 +230,5 @@ workflows: - lint-podspec - swiftlint - build-and-test-ios12-iphonexsmax - - build-and-test-ios11-iphonex - - build-and-test-ios10-iphone7 - build-documentation - push-podspec: *filter-version-tags-only diff --git a/.ruby-version b/.ruby-version index 0465952a..2cc0d985 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4 +ruby-2.5 diff --git a/.swift-version b/.swift-version index bf77d549..819e07a2 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0 diff --git a/Example/JJFloatingActionButton.xcodeproj/project.pbxproj b/Example/JJFloatingActionButton.xcodeproj/project.pbxproj index b55f8bbe..cb8e7ede 100644 --- a/Example/JJFloatingActionButton.xcodeproj/project.pbxproj +++ b/Example/JJFloatingActionButton.xcodeproj/project.pbxproj @@ -297,12 +297,12 @@ TargetAttributes = { 198B65FC1FBAE904009A17F2 = { CreatedOnToolsVersion = 9.1; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; 198B66121FBAE904009A17F2 = { CreatedOnToolsVersion = 9.1; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; TestTargetID = 198B65FC1FBAE904009A17F2; }; @@ -359,7 +359,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/JJFloatingActionButton/JJFloatingActionButton.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -368,7 +368,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 3914CEF0D1A991BDE4776522 /* [CP] Check Pods Manifest.lock */ = { @@ -413,7 +413,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-JJFloatingActionButton_Tests/Pods-JJFloatingActionButton_Tests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Tests/Pods-JJFloatingActionButton_Tests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/Nimble-Snapshots/Nimble_Snapshots.framework", "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", @@ -428,7 +428,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JJFloatingActionButton_Tests/Pods-JJFloatingActionButton_Tests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Tests/Pods-JJFloatingActionButton_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -626,7 +626,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.JJFloatingActionButton-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -645,7 +645,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.JJFloatingActionButton-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -665,7 +665,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.JJFloatingActionButton-ExampleTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/JJFloatingActionButton_Example.app/JJFloatingActionButton_Example"; }; @@ -686,7 +686,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.JJFloatingActionButton-ExampleTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/JJFloatingActionButton_Example.app/JJFloatingActionButton_Example"; }; diff --git a/Example/JJFloatingActionButton.xcodeproj/xcshareddata/xcschemes/JJFloatingActionButton_Example.xcscheme b/Example/JJFloatingActionButton.xcodeproj/xcshareddata/xcschemes/JJFloatingActionButton_Example.xcscheme index 8cb06c30..5d555a69 100644 --- a/Example/JJFloatingActionButton.xcodeproj/xcshareddata/xcschemes/JJFloatingActionButton_Example.xcscheme +++ b/Example/JJFloatingActionButton.xcodeproj/xcshareddata/xcschemes/JJFloatingActionButton_Example.xcscheme @@ -1,6 +1,6 @@ diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 1ca9ca27..f7dd8779 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -5,13 +5,13 @@ PODS: - iOSSnapshotTestCase/SwiftSupport (5.0.2): - iOSSnapshotTestCase/Core - JJFloatingActionButton (1.2.0) - - Nimble (7.3.3) + - Nimble (7.3.4) - Nimble-Snapshots (6.9.1): - Nimble-Snapshots/Core (= 6.9.1) - Nimble-Snapshots/Core (6.9.1): - iOSSnapshotTestCase (~> 5.0) - Nimble (~> 7.0) - - Quick (1.3.4) + - Quick (2.0.0) DEPENDENCIES: - JJFloatingActionButton (from `../`) @@ -32,11 +32,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: iOSSnapshotTestCase: 2d51aa06775e95cecb0a1fb9c5c159ccd1dd4596 - JJFloatingActionButton: 037dc8b3feee3de982183c3628033fd2c1d89709 - Nimble: 3b434b1e7d0a92603a13550a82880b0d952f518e + JJFloatingActionButton: 8d3fc4b4c389c6984583cc371fd89deb819fa521 + Nimble: 051e3d8912d40138fa5591c78594f95fb172af37 Nimble-Snapshots: bbd1ab264bacc24a9ce24a8363bc05aac783aeb0 - Quick: f4f7f063c524394c73ed93ac70983c609805d481 + Quick: ce1276c7c27ba2da3cb2fd0cde053c3648b3b22d PODFILE CHECKSUM: 8c19971bc03b1102942bae8dc764247c0986032d -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.1 diff --git a/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_375x812@3x.png b/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_375x812@3x.png new file mode 100644 index 00000000..5a3c5de3 Binary files /dev/null and b/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_375x812@3x.png differ diff --git a/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_414x896@2x.png b/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_414x896@2x.png new file mode 100644 index 00000000..89f16dbb Binary files /dev/null and b/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_414x896@2x.png differ diff --git a/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_414x896@3x.png b/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_414x896@3x.png new file mode 100644 index 00000000..5bdd3b5f Binary files /dev/null and b/Example/Tests/ReferenceImages/JJFloatingActionButtonPlacementSpec/JJFloatingActionButton__looks_correct_when_placed_in_view_controller_iPhone12_2_414x896@3x.png differ diff --git a/Gemfile b/Gemfile index 9244e210..c129cbce 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' do gem 'xcpretty' gem 'synx' gem 'github_changelog_generator' - gem 'jazzy', git: 'https://github.com/realm/jazzy', branch: 'master' + gem 'jazzy' gem 'rake' gem 'fileutils' gem 'octokit' diff --git a/Gemfile.lock b/Gemfile.lock index 759e2530..2498e7d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,8 @@ -GIT - remote: https://github.com/realm/jazzy - revision: 11742ed318b7e6c80834e87b4c178784533d216c - branch: master - specs: - jazzy (0.9.5) - cocoapods (~> 1.5.3) - mustache (~> 1.1.0) - open4 - redcarpet (~> 3.4.0) - rouge (>= 2.0.6, < 4.0) - sass (~> 3.6.0) - sqlite3 (~> 1.3.13) - xcinvoke (~> 0.3.0) - GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -27,31 +12,31 @@ GEM atomos (0.1.3) claide (1.0.2) clamp (0.6.5) - cocoapods (1.5.3) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 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.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) cocoapods-clean (0.0.1) - cocoapods-core (1.5.3) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) + cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -63,15 +48,15 @@ GEM cocoapods-try (1.1.0) colored2 (3.1.2) colorize (0.8.1) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) faraday (0.15.4) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) ffi (1.10.0) - fileutils (1.1.0) - fourflusher (2.0.1) + fileutils (1.2.0) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) github_changelog_generator (1.14.3) @@ -84,16 +69,25 @@ GEM retriable (~> 2.1) i18n (0.9.5) concurrent-ruby (~> 1.0) + jazzy (0.9.4) + cocoapods (~> 1.0) + mustache (~> 0.99) + open4 + redcarpet (~> 3.2) + rouge (>= 2.0.6, < 4.0) + sass (~> 3.4) + sqlite3 (~> 1.3) + xcinvoke (~> 0.3.0) liferaft (0.0.6) minitest (5.11.3) molinillo (0.6.6) multi_json (1.13.1) multipart-post (2.0.0) - mustache (1.1.0) + mustache (0.99.8) nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - octokit (4.13.0) + octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) public_suffix (3.0.3) @@ -105,8 +99,8 @@ GEM redcarpet (3.4.0) retriable (2.1.0) rouge (2.0.7) - ruby-macho (1.3.1) - sass (3.6.0) + ruby-macho (1.4.0) + sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -114,7 +108,7 @@ GEM sawyer (0.8.1) addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) - sqlite3 (1.3.13) + sqlite3 (1.4.0) synx (0.2.1) clamp (~> 0.6) colorize (~> 0.7) @@ -124,7 +118,7 @@ GEM thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.8.0) + xcodeproj (1.8.2) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -149,4 +143,4 @@ DEPENDENCIES xcpretty! BUNDLED WITH - 1.17.3 + 2.0.1 diff --git a/JJFloatingActionButton.podspec b/JJFloatingActionButton.podspec index 2f2bdabd..90f92d29 100644 --- a/JJFloatingActionButton.podspec +++ b/JJFloatingActionButton.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| spec.name = 'JJFloatingActionButton' spec.version = '1.2.0' - spec.swift_version = '4.2' + spec.swift_version = '5.0' spec.author = { 'Jochen Pfeiffer' => 'pod@jochen-pfeiffer.com' } spec.license = { :type => 'MIT', :file => 'LICENSE' } spec.homepage = 'https://github.com/jjochen/JJFloatingActionButton'