Skip to content

Commit ff0c2b0

Browse files
committed
Merge branch 'refactor'
2 parents bfdad04 + 52d45f9 commit ff0c2b0

24 files changed

+513
-568
lines changed

.gitignore

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,2 @@
1-
# Xcode
2-
#
3-
build/
4-
*.pbxuser
5-
!default.pbxuser
6-
*.mode1v3
7-
!default.mode1v3
8-
*.mode2v3
9-
!default.mode2v3
10-
*.perspectivev3
11-
!default.perspectivev3
12-
xcuserdata
13-
*.xccheckout
14-
*.moved-aside
15-
DerivedData
16-
*.hmap
17-
*.ipa
18-
*.xcuserstate
19-
20-
# CocoaPods
21-
#
22-
# We recommend against adding the Pods directory to your .gitignore. However
23-
# you should judge for yourself, the pros and cons are mentioned at:
24-
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
25-
#
26-
# Pods/
1+
## User settings
2+
xcuserdata/

.jazzy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ github_url: https://github.com/pronebird/UIScrollView-InfiniteScroll
55
github_file_prefix: https://github.com/pronebird/UIScrollView-InfiniteScroll/tree/9cddbf4d89
66

77
module: UIScrollView_InfiniteScroll
8-
module_version: 1.1.0
8+
module_version: 1.3.0
99

1010
clean: true
1111
theme: fullwidth
1212
objc: true
1313
sdk: iphonesimulator
1414

15-
framework_root: Classes
16-
umbrella_header: Classes/UIScrollView+InfiniteScroll.h
15+
framework_root: Sources/UIScrollView_InfiniteScroll
16+
umbrella_header: Sources/UIScrollView_InfiniteScroll/UIScrollView+InfiniteScroll.h

.swiftformat

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# general options
2+
--swiftversion 5.5
3+
4+
# format options
5+
--indent 4
6+
--maxwidth 100
7+
--wraparguments before-first
8+
--wrapparameters before-first
9+
--wrapternary before-operators
10+
--redundanttype inferred
11+
--ifdef no-indent
12+
--disable initCoderUnavailable, redundantReturn, unusedArguments, trailingCommas, redundantRawValues, preferKeyPath

CHANGES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= Unreleased
1+
= 1.3.0 (2022-08-07)
22

33
* Handle scrolling when voiceOver is running (@r-dent)
44

InfiniteScrollViewDemo-tvOS/Base.lproj/LaunchScreen.storyboard

Lines changed: 0 additions & 24 deletions
This file was deleted.

InfiniteScrollViewDemoSwift.xcodeproj/project.pbxproj

Lines changed: 22 additions & 86 deletions
Large diffs are not rendered by default.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

InfiniteScrollViewDemoSwift/AppDelegate.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ import UIKit
1010

1111
@UIApplicationMain
1212
class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {
13-
1413
var window: UIWindow?
1514

16-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
15+
func application(
16+
_ application: UIApplication,
17+
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
18+
) -> Bool {
1719
return true
1820
}
1921
}
20-

0 commit comments

Comments
 (0)