Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a9862768c9 | |||
| 638bdd85f7 | |||
| 723ec56928 | |||
| d870af6f60 | |||
| 4c98d75ebf | |||
| 66b65065eb | |||
| 6753c18c88 | |||
| 2c696f793c | |||
| e0fd17dcf9 | |||
| 22dc85ef9a | |||
| db3184c16c | |||
| 1fd7e5f2c1 | |||
| 2d954c904d |
@@ -20,6 +20,20 @@
|
||||
ReferencedContainer = "container:">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "Common"
|
||||
BuildableName = "Common"
|
||||
BlueprintName = "Common"
|
||||
ReferencedContainer = "container:">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
|
||||
@@ -100,7 +100,6 @@ class SignUpViewController: ScrollingContentViewController {
|
||||
textField.isSecureTextEntry = isSecureTextEntry
|
||||
}
|
||||
|
||||
// swiftlint:disable:next function_body_length
|
||||
private func addConstraints() {
|
||||
logoImageView.translatesAutoresizingMaskIntoConstraints = false
|
||||
nameTextField.translatesAutoresizingMaskIntoConstraints = false
|
||||
|
||||
+29
-24
@@ -19,30 +19,35 @@ let package = Package(
|
||||
.target(
|
||||
name: "ScrollingContentViewController",
|
||||
dependencies: []
|
||||
),
|
||||
.testTarget(
|
||||
name: "StoryboardTests",
|
||||
dependencies: ["ScrollingContentViewController"]
|
||||
),
|
||||
.testTarget(
|
||||
name: "CodeTests",
|
||||
dependencies: ["ScrollingContentViewController"]
|
||||
),
|
||||
.testTarget(
|
||||
name: "ManagerTests",
|
||||
dependencies: ["ScrollingContentViewController"]
|
||||
),
|
||||
.testTarget(
|
||||
name: "IntrinsicSizeTests",
|
||||
dependencies: ["ScrollingContentViewController"]
|
||||
),
|
||||
.testTarget(
|
||||
name: "KeyboardTests",
|
||||
dependencies: ["ScrollingContentViewController"]
|
||||
),
|
||||
.testTarget(
|
||||
name: "InsetContentViewKeyboardTests",
|
||||
dependencies: ["ScrollingContentViewController"]
|
||||
)
|
||||
// .target(
|
||||
// name: "Common",
|
||||
// dependencies: ["ScrollingContentViewController"],
|
||||
// path: "Tests/Common"
|
||||
// ),
|
||||
// .testTarget(
|
||||
// name: "StoryboardTests",
|
||||
// dependencies: ["ScrollingContentViewController", "Common"]
|
||||
// ),
|
||||
// .testTarget(
|
||||
// name: "CodeTests",
|
||||
// dependencies: ["ScrollingContentViewController", "Common"]
|
||||
// ),
|
||||
// .testTarget(
|
||||
// name: "ManagerTests",
|
||||
// dependencies: ["ScrollingContentViewController", "Common"]
|
||||
// ),
|
||||
// .testTarget(
|
||||
// name: "IntrinsicSizeTests",
|
||||
// dependencies: ["ScrollingContentViewController"]
|
||||
// ),
|
||||
// .testTarget(
|
||||
// name: "KeyboardTests",
|
||||
// dependencies: ["ScrollingContentViewController"]
|
||||
// ),
|
||||
// .testTarget(
|
||||
// name: "InsetContentViewKeyboardTests",
|
||||
// dependencies: ["ScrollingContentViewController"]
|
||||
// )
|
||||
]
|
||||
)
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
# Release Steps
|
||||
|
||||
1. Determine the new release number, like `1.6.6` and search and replace the previous version number with it in this file.
|
||||
|
||||
2. Verify that the tests pass:
|
||||
```
|
||||
xcodebuild test -scheme ScrollingContentViewControllerTests -sdk iphonesimulator16.2 -destination "OS=16.2,name=iPhone 14"
|
||||
```
|
||||
|
||||
3. In `Sources > Info.plist`, update `Bundle version string` with the new release number.
|
||||
|
||||
4. In `ScrollingContentViewController.podspec`, update `s.version` with the new release number.
|
||||
|
||||
5. Verify that the Swift package file is valid:
|
||||
```
|
||||
swift package describe
|
||||
```
|
||||
|
||||
6. Verify that the Cocoapods spec file is valid:
|
||||
```
|
||||
pod lib lint
|
||||
```
|
||||
|
||||
7. Commit the updated release number and Cocopods spec file:
|
||||
```
|
||||
git add -A && git commit -m "Release 1.6.6"
|
||||
git push
|
||||
```
|
||||
|
||||
8. Create a tag for the new release. For consistency, **do not** prefix tags with 'v'.
|
||||
```
|
||||
git tag '1.6.6'
|
||||
git push --tags
|
||||
```
|
||||
|
||||
9. Submit the new release to the Cocoapods specs repo:
|
||||
```
|
||||
pod trunk push ScrollingContentViewController.podspec
|
||||
```
|
||||
|
||||
If that doesn't work, first follow the steps at https://guides.cocoapods.org/making/getting-setup-with-trunk.html
|
||||
using the email address in `ScrollingContentViewController.podspec` to register the local device with the Cocoapods trunk.
|
||||
```
|
||||
pod trunk register drew@retroactivefiasco.com 'Drew Olbrich' --description='MacBook Pro'
|
||||
```
|
||||
|
||||
10. Draft a new release on GitHub at https://github.com/drewolbrich/ScrollingContentViewController/releases
|
||||
|
||||
11. For the new release, use the release number 1.6.6 as the title and prefix each item in the description with bullets, indicated by '*'.
|
||||
|
||||
12. Leave **Set as the latest release** checked and click **Publish**.
|
||||
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'ScrollingContentViewController'
|
||||
s.version = '1.6.4'
|
||||
s.version = '1.6.6'
|
||||
s.summary = 'A Swift library that simplifies making a view controller\'s view scrollable'
|
||||
|
||||
s.description = <<-DESC
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
3A06577C2200A552005BE8CC /* IsUnitTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A06577B2200A552005BE8CC /* IsUnitTest.swift */; };
|
||||
3A1A174626A4839F006EE907 /* UIView+FirstResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1A174526A4839F006EE907 /* UIView+FirstResponder.swift */; };
|
||||
3A1A176026A485BB006EE907 /* CodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1A174B26A48489006EE907 /* CodeTests.swift */; };
|
||||
3A1A176126A485C3006EE907 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1A175626A48489006EE907 /* ContentView.swift */; };
|
||||
3A1A176226A485C3006EE907 /* StoryboardTests.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3A1A175426A48489006EE907 /* StoryboardTests.storyboard */; };
|
||||
3A1A176326A485C3006EE907 /* IntrinsicSizeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1A174926A48489006EE907 /* IntrinsicSizeTests.swift */; };
|
||||
3A1A176426A485C3006EE907 /* IntrinsicSizeContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A1A174E26A48489006EE907 /* IntrinsicSizeContentView.swift */; };
|
||||
@@ -41,6 +40,7 @@
|
||||
3A83273921E700A000E8D95C /* SignUpController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A83273721E700A000E8D95C /* SignUpController.swift */; };
|
||||
3A83273B21E703F600E8D95C /* SignUpControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A83273A21E703F600E8D95C /* SignUpControllerDelegate.swift */; };
|
||||
3A83273C21E703F600E8D95C /* SignUpControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A83273A21E703F600E8D95C /* SignUpControllerDelegate.swift */; };
|
||||
3A89319329D0D127009BD5DD /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A89319229D0D127009BD5DD /* ContentView.swift */; };
|
||||
3AAC048F21E2D4C500D94DA5 /* ScrollingContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAC048E21E2D4C500D94DA5 /* ScrollingContentViewController.swift */; };
|
||||
3AAC049121E2D4F100D94DA5 /* ScrollingContentViewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAC049021E2D4F100D94DA5 /* ScrollingContentViewManager.swift */; };
|
||||
3AAC049921E2F01C00D94DA5 /* KeyboardObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAC049421E2F01C00D94DA5 /* KeyboardObserver.swift */; };
|
||||
@@ -209,7 +209,6 @@
|
||||
3A1A175226A48489006EE907 /* ManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ManagerTests.swift; sourceTree = "<group>"; };
|
||||
3A1A175426A48489006EE907 /* StoryboardTests.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = StoryboardTests.storyboard; sourceTree = "<group>"; };
|
||||
3A1A175526A48489006EE907 /* StoryboardTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardTests.swift; sourceTree = "<group>"; };
|
||||
3A1A175626A48489006EE907 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
|
||||
3A1A176A26A48701006EE907 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
3A5702CE21E2CBB600E4CC55 /* ScrollingContentViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ScrollingContentViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
3A5702D121E2CBB600E4CC55 /* ScrollingContentViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScrollingContentViewController.h; sourceTree = "<group>"; };
|
||||
@@ -224,6 +223,8 @@
|
||||
3A7014BB21EBD723002C6740 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
3A83273721E700A000E8D95C /* SignUpController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpController.swift; sourceTree = "<group>"; };
|
||||
3A83273A21E703F600E8D95C /* SignUpControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpControllerDelegate.swift; sourceTree = "<group>"; };
|
||||
3A89319229D0D127009BD5DD /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
|
||||
3A89319429D0D3AC009BD5DD /* Release-Steps.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "Release-Steps.md"; sourceTree = "<group>"; };
|
||||
3AAC048821E2D3FD00D94DA5 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
|
||||
3AAC048921E2D3FD00D94DA5 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
|
||||
3AAC048A21E2D3FD00D94DA5 /* ScrollingContentViewController.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = ScrollingContentViewController.podspec; sourceTree = "<group>"; };
|
||||
@@ -252,7 +253,6 @@
|
||||
3AC88F4F21E5B7F500EED460 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
3AC88F5021E5B7F600EED460 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
3ACE0D7B220B34BE0093FE5A /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
|
||||
3ACE0D7C220B34BE0093FE5A /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
|
||||
3AD597D221F420ED00F220A0 /* KeyboardNotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardNotificationManager.swift; sourceTree = "<group>"; };
|
||||
3AD597D421F4221B00F220A0 /* KeyboardNotificationObserving.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardNotificationObserving.swift; sourceTree = "<group>"; };
|
||||
3ADD380921EBFC6200396B7A /* KeyboardFrameEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardFrameEvent.swift; sourceTree = "<group>"; };
|
||||
@@ -338,6 +338,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3A1A174926A48489006EE907 /* IntrinsicSizeTests.swift */,
|
||||
3A1A174E26A48489006EE907 /* IntrinsicSizeContentView.swift */,
|
||||
);
|
||||
path = IntrinsicSizeTests;
|
||||
sourceTree = "<group>";
|
||||
@@ -354,7 +355,6 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3A1A174D26A48489006EE907 /* InsetContentViewKeyboardTests.swift */,
|
||||
3A1A174E26A48489006EE907 /* IntrinsicSizeContentView.swift */,
|
||||
);
|
||||
path = InsetContentViewKeyboardTests;
|
||||
sourceTree = "<group>";
|
||||
@@ -380,7 +380,6 @@
|
||||
children = (
|
||||
3A1A175426A48489006EE907 /* StoryboardTests.storyboard */,
|
||||
3A1A175526A48489006EE907 /* StoryboardTests.swift */,
|
||||
3A1A175626A48489006EE907 /* ContentView.swift */,
|
||||
);
|
||||
path = StoryboardTests;
|
||||
sourceTree = "<group>";
|
||||
@@ -390,10 +389,10 @@
|
||||
children = (
|
||||
3AAC048921E2D3FD00D94DA5 /* LICENSE */,
|
||||
3AAC048821E2D3FD00D94DA5 /* README.md */,
|
||||
3A89319429D0D3AC009BD5DD /* Release-Steps.md */,
|
||||
3A5B3C98265D3D2100E26100 /* Package.swift */,
|
||||
3AAC048A21E2D3FD00D94DA5 /* ScrollingContentViewController.podspec */,
|
||||
3ACE0D7B220B34BE0093FE5A /* .swiftlint.yml */,
|
||||
3ACE0D7C220B34BE0093FE5A /* .travis.yml */,
|
||||
3A5702D021E2CBB600E4CC55 /* Sources */,
|
||||
3AAC04A521E39FBF00D94DA5 /* Examples */,
|
||||
3A5702DB21E2CBB600E4CC55 /* Tests */,
|
||||
@@ -428,6 +427,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3A1A176A26A48701006EE907 /* Info.plist */,
|
||||
3A89319129D0D127009BD5DD /* Common */,
|
||||
3A1A174A26A48489006EE907 /* CodeTests */,
|
||||
3A1A174C26A48489006EE907 /* InsetContentViewKeyboardTests */,
|
||||
3A1A174826A48489006EE907 /* IntrinsicSizeTests */,
|
||||
@@ -474,6 +474,14 @@
|
||||
path = ManagerExample;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
3A89319129D0D127009BD5DD /* Common */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
3A89319229D0D127009BD5DD /* ContentView.swift */,
|
||||
);
|
||||
path = Common;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
3AAC04A521E39FBF00D94DA5 /* Examples */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
@@ -881,10 +889,10 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
3A1A176726A485C3006EE907 /* ManagerTests.swift in Sources */,
|
||||
3A1A176126A485C3006EE907 /* ContentView.swift in Sources */,
|
||||
3A1A176526A485C3006EE907 /* StoryboardTests.swift in Sources */,
|
||||
3A1A176826A485C3006EE907 /* InsetContentViewKeyboardTests.swift in Sources */,
|
||||
3A1A176626A485C3006EE907 /* KeyboardTests.swift in Sources */,
|
||||
3A89319329D0D127009BD5DD /* ContentView.swift in Sources */,
|
||||
3A1A176426A485C3006EE907 /* IntrinsicSizeContentView.swift in Sources */,
|
||||
3A1A176026A485BB006EE907 /* CodeTests.swift in Sources */,
|
||||
3A1A176326A485C3006EE907 /* IntrinsicSizeTests.swift in Sources */,
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.6.4</string>
|
||||
<string>1.6.6</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
</dict>
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
import UIKit
|
||||
|
||||
/// A view assigned `contentView` property in StoryboardTests.storyboard.
|
||||
class ContentView: UIView {
|
||||
/// A content view used by `StoryboardTests`, `CodeTests`, and `ManagerTests`.
|
||||
public class ContentView: UIView {
|
||||
|
||||
/// A constraint that determines the view's width.
|
||||
var widthConstraint: NSLayoutConstraint!
|
||||
public var widthConstraint: NSLayoutConstraint!
|
||||
|
||||
/// A constraint that determine the view's height. This constraint's constant is
|
||||
/// manipulated externally to test the behavior of views of varying heights.
|
||||
var heightConstraint: NSLayoutConstraint!
|
||||
public var heightConstraint: NSLayoutConstraint!
|
||||
|
||||
override init(frame: CGRect) {
|
||||
super.init(frame: frame)
|
||||
Reference in New Issue
Block a user