Skip to content

Commit

Permalink
Update dependencies (#210)
Browse files Browse the repository at this point in the history 
* Update dependencies

* Add missing test for action item
  • Loading branch information
@jjochen
jjochen committed Sep 6, 2019
1 parent dfbaa82 commit 689043f
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 50 deletions.
24 changes: 8 additions & 16 deletions Example/JJFloatingActionButton.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,12 @@
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/JJFloatingActionButton/JJFloatingActionButton.framework",
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JJFloatingActionButton.framework",
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Example/Pods-JJFloatingActionButton_Example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -412,19 +411,12 @@
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${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",
"${BUILT_PRODUCTS_DIR}/iOSSnapshotTestCase/FBSnapshotTestCase.framework",
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Tests/Pods-JJFloatingActionButton_Tests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble_Snapshots.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSnapshotTestCase.framework",
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-JJFloatingActionButton_Tests/Pods-JJFloatingActionButton_Tests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down
8 changes: 4 additions & 4 deletions Example/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PODS:
- Nimble-Snapshots/Core (6.9.1):
- iOSSnapshotTestCase (~> 5.0)
- Nimble (~> 7.0)
- Quick (2.0.0)
- Quick (2.1.0)

DEPENDENCIES:
- JJFloatingActionButton (from `../`)
Expand All @@ -32,11 +32,11 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
iOSSnapshotTestCase: 2d51aa06775e95cecb0a1fb9c5c159ccd1dd4596
JJFloatingActionButton: 93e08243951c5cc7ce7f1724289fe74cbf26ff40
JJFloatingActionButton: 5fc3df9cac6c0e8d8248997ad3fad25a678f9e76
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
Nimble-Snapshots: bbd1ab264bacc24a9ce24a8363bc05aac783aeb0
Quick: ce1276c7c27ba2da3cb2fd0cde053c3648b3b22d
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d

PODFILE CHECKSUM: 8c19971bc03b1102942bae8dc764247c0986032d

COCOAPODS: 1.6.1
COCOAPODS: 1.7.5
5 changes: 5 additions & 0 deletions Example/Tests/JJActionItemSpec.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ class JJActionItemSpec: QuickSpec {
actionItem.titleSpacing = 42
expect(actionItem) == snapshot()
}

it("looks correct with empty title") {
actionItem.titleLabel.text = ""
expect(actionItem) == snapshot()
}
}

describe("JJActionItem loaded from xib") {
Expand Down
Binary file added ...enceImages/JJActionItemSpec/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 30 additions & 30 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
claide (1.0.2)
claide (1.0.3)
clamp (0.6.5)
cocoapods (1.6.1)
cocoapods (1.7.5)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.5)
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)
Expand All @@ -25,14 +25,14 @@ GEM
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.2.0, < 3.0)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-clean (0.0.1)
cocoapods-core (1.6.1)
cocoapods-core (1.7.5)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand All @@ -42,7 +42,7 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
cocoapods-trunk (1.4.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
Expand All @@ -54,9 +54,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
ffi (1.10.0)
ffi (1.11.1)
fileutils (1.2.0)
fourflusher (2.2.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
github_changelog_generator (1.14.3)
Expand All @@ -69,46 +69,46 @@ GEM
retriable (~> 2.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.9.4)
cocoapods (~> 1.0)
mustache (~> 0.99)
jazzy (0.10.0)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4
redcarpet (~> 3.2)
redcarpet (~> 3.4)
rouge (>= 2.0.6, < 4.0)
sass (~> 3.4)
sass (~> 3.6)
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 (0.99.8)
multipart-post (2.1.1)
mustache (1.1.0)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
public_suffix (3.0.3)
public_suffix (4.0.1)
rainbow (3.0.0)
rake (12.3.2)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
redcarpet (3.5.0)
retriable (2.1.0)
rouge (2.0.7)
ruby-macho (1.4.0)
sass (3.7.3)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
sqlite3 (1.4.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
sqlite3 (1.4.1)
synx (0.2.1)
clamp (~> 0.6)
colorize (~> 0.7)
Expand All @@ -118,7 +118,7 @@ GEM
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.8.2)
xcodeproj (1.12.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -143,4 +143,4 @@ DEPENDENCIES
xcpretty!

BUNDLED WITH
2.0.1
2.0.2

0 comments on commit 689043f

Please sign in to comment.