5 Commits

Author SHA1 Message Date
Drew Olbrich 6691322781 Set version to 1.6.3 2022-10-22 15:02:47 -07:00
Drew Olbrich 8bdbc44f39 Fix Xcode 14 SwiftLint dependency analysis warning 2022-10-22 12:58:55 -07:00
Drew Olbrich 5ae5c97f00 Fix access to SwiftLint on M1 macs 2022-10-22 12:57:47 -07:00
Drew Olbrich 1108944654 Update comments 2022-05-18 18:25:37 -07:00
Drew Olbrich 365840db98 Update Travis CI link 2022-04-16 12:47:45 -07:00
5 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
# ScrollingContentViewController
[![Travis](https://img.shields.io/travis/drewolbrich/ScrollingContentViewController.svg)](https://travis-ci.com/drewolbrich/ScrollingContentViewController)
[![Travis](https://img.shields.io/travis/drewolbrich/ScrollingContentViewController.svg)](https://app.travis-ci.com/github/drewolbrich/ScrollingContentViewController)
[![Platform](https://img.shields.io/badge/platform-iOS-lightgray.svg)](http://developer.apple.com/ios)
[![Swift 5](https://img.shields.io/badge/swift-5-red.svg?style=flat)](https://developer.apple.com/swift)
[![License](https://img.shields.io/github/license/drewolbrich/ScrollingContentViewController.svg)](LICENSE)
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ScrollingContentViewController'
s.version = '1.6.2'
s.version = '1.6.3'
s.summary = 'A Swift library that simplifies making a view controller\'s view scrollable'
s.description = <<-DESC
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@@ -831,6 +831,7 @@
/* Begin PBXShellScriptBuildPhase section */
3ACE0D7A220B2D790093FE5A /* Run SwiftLint */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -845,7 +846,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
shellScript = "# If we don't do this, then SwiftLint won't be found on M1 macs,\n# because it's installed in /opt/homebrew/bin instead of /usr/local/bin\n# on that platform \nif test -d \"/opt/homebrew/bin/\"; then\n PATH=\"/opt/homebrew/bin/:${PATH}\"\nfi\nexport PATH\n\nif which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
+1 -1
View File
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.6.1</string>
<string>1.6.3</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
@@ -111,7 +111,7 @@ public class ScrollingContentScrollView: UIScrollView {
/// - view: The view to make visible.
/// - animated: If `true`, the scrolling is animated.
/// - margin: An optional margin to apply to the view. If left unspecified,
/// `scrollToVisibleMargin` is used.
/// `visibilityScrollMargin` is used.
public func scrollViewToVisible(_ view: UIView, animated: Bool, margin: CGFloat? = nil) {
scrollViewFilter?.submitScrollRectEvent(ScrollRectEvent(contentArea: .descendantViewRect(view.bounds, descendantView: view), animated: animated, margin: margin ?? visibilityScrollMargin))
@@ -124,7 +124,7 @@ public class ScrollingContentScrollView: UIScrollView {
/// - Parameters:
/// - animated: If `true`, the scrolling is animated.
/// - margin: An optional margin to apply to the first responder. If left
/// unspecified, `scrollToVisibleMargin` is used.
/// unspecified, `visibilityScrollMargin` is used.
public func scrollFirstResponderToVisible(animated: Bool, margin: CGFloat? = nil) {
guard let view = self.firstResponder as? UIView else {
return