Skip to content

Commit bb17076

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
#Conflicts: # IQKeyboardManagerSwift.podspec.json
2 parents a559492 + 3989683 commit bb17076

2 files changed

Lines changed: 30 additions & 34 deletions

File tree

IQKeyboardManagerSwift.podspec.json

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"summary": "Codeless drop-in universal library allows to prevent issues of keyboard sliding up and cover UITextField/UITextView.",
99
"homepage": "https://github.com/hackiftekhar/IQKeyboardManager",
10-
"screenshots": "https://raw.githubusercontent.com/hackiftekhar/IQKeyboardManager/master/Screenshot/IQKeyboardManagerScreenshot.png",
10+
"screenshots": "https://raw.githubusercontent.com/hackiftekhar/IQKeyboardManager/master/Screenshot/Social.png",
1111
"license": "MIT",
1212
"authors": {
1313
"Iftekhar Qurashi": "hack.iftekhar@gmail.com"
@@ -24,17 +24,22 @@
2424
"IQKeyboardNotification": ["1.0.3"],
2525
"IQTextInputViewNotification": ["1.0.5"]
2626
},
27-
"source_files": [
28-
"IQKeyboardManagerSwift/IQKeyboardCore/**/*.{swift}",
29-
"IQKeyboardManagerSwift/IQKeyboardManager/**/*.{swift}",
30-
"IQKeyboardManagerSwift/IQKeyboardNotification/**/*.{swift}",
31-
"IQKeyboardManagerSwift/IQTextInputViewNotification/**/*.{swift}"
32-
],
3327
"subspecs": [
3428
{
3529
"name": "Appearance",
3630
"source_files": [
3731
"IQKeyboardManagerSwift/Appearance/**/*.{swift}"
32+
],
33+
"dependencies": {
34+
"IQKeyboardManagerSwift/Core": []
35+
}
36+
},
37+
{
38+
"name": "Core",
39+
"source_files": [
40+
"IQKeyboardManagerSwift/IQKeyboardManager/**/*.{swift}",
41+
"IQKeyboardManagerSwift/IQKeyboardNotification/**/*.{swift}",
42+
"IQKeyboardManagerSwift/IQTextInputViewNotification/**/*.{swift}"
3843
]
3944
},
4045
{
@@ -48,6 +53,9 @@
4853
"source_files": [
4954
"IQKeyboardManagerSwift/IQKeyboardToolbarManager/**/*.{swift}"
5055
],
56+
"dependencies": {
57+
"IQKeyboardManagerSwift/Core": []
58+
},
5159
"subspecs": [
5260
{
5361
"name": "IQKeyboardToolbar",
@@ -61,17 +69,24 @@
6169
"name": "IQTextView",
6270
"source_files": [
6371
"IQKeyboardManagerSwift/IQTextView/**/*.{swift}"
64-
]
72+
],
73+
"dependencies": {
74+
"IQKeyboardManagerSwift/IQKeyboardToolbarManager/IQKeyboardToolbar": []
75+
}
6576
},
6677
{
6778
"name": "Resign",
6879
"source_files": [
6980
"IQKeyboardManagerSwift/Resign/**/*.{swift}"
70-
]
81+
],
82+
"dependencies": {
83+
"IQKeyboardManagerSwift/Core": []
84+
}
7185
}
7286
],
7387
"default_subspecs": [
7488
"Appearance",
89+
"Core",
7590
"IQKeyboardReturnKeyHandler",
7691
"IQKeyboardToolbarManager",
7792
"IQTextView",

Podfile.lock

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,11 @@ PODS:
33
- IQDropDownTextFieldSwift (4.0.4)
44
- IQKeyboardCore (1.0.5)
55
- IQKeyboardManager (6.5.19)
6-
- IQKeyboardManagerSwift (7.2.0):
7-
- IQKeyboardManagerSwift/Appearance (= 7.2.0)
8-
- IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler (= 7.2.0)
9-
- IQKeyboardManagerSwift/IQKeyboardToolbarManager (= 7.2.0)
10-
- IQKeyboardManagerSwift/IQTextView (= 7.2.0)
11-
- IQKeyboardManagerSwift/Resign (= 7.2.0)
12-
- IQKeyboardNotification (= 1.0.3)
13-
- IQTextInputViewNotification (= 1.0.5)
146
- IQKeyboardManagerSwift/Appearance (7.2.0):
7+
- IQKeyboardManagerSwift/Core
158
- IQKeyboardNotification (= 1.0.3)
169
- IQTextInputViewNotification (= 1.0.5)
17-
- IQKeyboardManagerSwift/IQKeyboardReturnKeyHandler (7.2.0):
18-
- IQKeyboardNotification (= 1.0.3)
19-
- IQTextInputViewNotification (= 1.0.5)
20-
- IQKeyboardManagerSwift/IQKeyboardToolbarManager (7.2.0):
21-
- IQKeyboardManagerSwift/IQKeyboardToolbarManager/IQKeyboardToolbar (= 7.2.0)
22-
- IQKeyboardNotification (= 1.0.3)
23-
- IQTextInputViewNotification (= 1.0.5)
24-
- IQKeyboardManagerSwift/IQKeyboardToolbarManager/IQKeyboardToolbar (7.2.0):
25-
- IQKeyboardNotification (= 1.0.3)
26-
- IQTextInputViewNotification (= 1.0.5)
27-
- IQKeyboardManagerSwift/IQTextView (7.2.0):
28-
- IQKeyboardNotification (= 1.0.3)
29-
- IQTextInputViewNotification (= 1.0.5)
30-
- IQKeyboardManagerSwift/Resign (7.2.0):
10+
- IQKeyboardManagerSwift/Core (7.2.0):
3111
- IQKeyboardNotification (= 1.0.3)
3212
- IQTextInputViewNotification (= 1.0.5)
3313
- IQKeyboardNotification (1.0.3)
@@ -40,7 +20,8 @@ DEPENDENCIES:
4020
- IQDropDownTextField
4121
- IQDropDownTextFieldSwift
4222
- IQKeyboardManager (from `.`)
43-
- IQKeyboardManagerSwift (from `.`)
23+
- IQKeyboardManagerSwift/Appearance (from `.`)
24+
- IQKeyboardManagerSwift/Core (from `.`)
4425
- RSKPlaceholderTextView
4526
- SwiftLint
4627

@@ -65,12 +46,12 @@ SPEC CHECKSUMS:
6546
IQDropDownTextFieldSwift: fe6cf39c35dae95335a651e0e08a842a49f08b57
6647
IQKeyboardCore: 28c8bf3bcd8ba5aa1570b318cbc4da94b861711e
6748
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
68-
IQKeyboardManagerSwift: 16cbb0574676b9a0b0ed4e268a899804bda1161d
49+
IQKeyboardManagerSwift: 12d6ae3632ef744ccd033c048b566af13cc10d49
6950
IQKeyboardNotification: d7382c4466c5a5adef92c7452ebf861b36050088
7051
IQTextInputViewNotification: 4381fb828881983205fbee38f17da8a9fe2e835c
7152
RSKPlaceholderTextView: 85cb165bfbfe160a2e7bfb6bcd77a21100ce1b52
7253
SwiftLint: c5fa0b7eece474d43d2178b581a1242a16267347
7354

74-
PODFILE CHECKSUM: 3b40fa32174c001e42fb03b0ec3a4357e8233cf5
55+
PODFILE CHECKSUM: 24e9c22ba3a188b4cca732852d062112905185ac
7556

7657
COCOAPODS: 1.15.2

0 commit comments

Comments
 (0)