Skip to content

Commit fa72d6c

Browse files
bcylinbcylin
committed
Merge branch 'feature/subspecs' into develop
2 parents eeeb015 + 66fd168 commit fa72d6c

14 files changed

Lines changed: 34 additions & 21 deletions

File tree

‎ICInputAccessory.podspec‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
Pod::Spec.new do |s|
22
s.name = "ICInputAccessory"
33
s.version = "1.0.0"
4-
s.summary = "Customized text fields used in the iCook app."
4+
s.summary = "A customized token text field used in the iCook app."
55
s.description = <<-DESC
66
ICKeyboardDismissTextField:
77
* An input accessory view with a button to dismiss keyboard.
88
99
ICTokenField:
1010
* A horizontal scrolling UI that groups input texts.
11-
* Easy to add and delete tokens.
11+
* Easy to add, select and delete tokens.
1212
* Customizable icon and colors.
13+
* Supports storyboard.
1314
DESC
1415

15-
s.screenshots = "https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICKeyboardDismissTextField.png",
16-
"https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICTokenField.png"
16+
s.screenshots = "https://polydice.github.io/ICInputAccessory/screenshots/ICTokenField.png",
17+
"https://polydice.github.io/ICInputAccessory/screenshots/ICKeyboardDismissTextField.png"
1718
s.homepage = "https://github.com/polydice/ICInputAccessory"
1819
s.license = { type: "MIT", file: "LICENSE" }
1920
s.authors = "bcylin", "trisix"
20-
2121
s.platform = :ios, "8.0"
2222
s.source = { git: "https://github.com/polydice/ICInputAccessory.git", tag: "v#{s.version}" }
23-
s.source_files = "Source/*.swift"
24-
s.resources = "Source/*.xcassets"
2523
s.requires_arc = true
24+
25+
s.default_subspecs = "KeyboardDismissTextField", "TokenField"
26+
27+
s.subspec :KeyboardDismissTextField do |sp|
28+
sp.source_files = "Source/KeyboardDismissTextField/*.swift"
29+
sp.resources = "Source/KeyboardDismissTextField/*.xcassets"
30+
end
31+
32+
s.subspec :TokenField do |sp|
33+
sp.source_files = "Source/TokenField/*.swift"
34+
end
2635
end

‎ICInputAccessory.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21-
B52819681C9035BE007D01D5 /* ICBackspaceTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICBackspaceTextField.swift; path = Source/ICBackspaceTextField.swift; sourceTree = SOURCE_ROOT; };
22-
B52819691C9035BE007D01D5 /* ICInsetLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICInsetLabel.swift; path = Source/ICInsetLabel.swift; sourceTree = SOURCE_ROOT; };
23-
B528196A1C9035BE007D01D5 /* ICToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICToken.swift; path = Source/ICToken.swift; sourceTree = SOURCE_ROOT; };
24-
B528196B1C9035BE007D01D5 /* ICTokenField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICTokenField.swift; path = Source/ICTokenField.swift; sourceTree = SOURCE_ROOT; };
25-
B548C5AC1C8D69A5009D5AEE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Source/Images.xcassets; sourceTree = SOURCE_ROOT; };
26-
B548C5ED1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissTextField.swift; path = Source/ICKeyboardDismissTextField.swift; sourceTree = SOURCE_ROOT; };
21+
B52819681C9035BE007D01D5 /* ICBackspaceTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICBackspaceTextField.swift; path = Source/TokenField/ICBackspaceTextField.swift; sourceTree = SOURCE_ROOT; };
22+
B52819691C9035BE007D01D5 /* ICInsetLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICInsetLabel.swift; path = Source/TokenField/ICInsetLabel.swift; sourceTree = SOURCE_ROOT; };
23+
B528196A1C9035BE007D01D5 /* ICToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICToken.swift; path = Source/TokenField/ICToken.swift; sourceTree = SOURCE_ROOT; };
24+
B528196B1C9035BE007D01D5 /* ICTokenField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICTokenField.swift; path = Source/TokenField/ICTokenField.swift; sourceTree = SOURCE_ROOT; };
25+
B548C5AC1C8D69A5009D5AEE /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Source/KeyboardDismissTextField/Images.xcassets; sourceTree = SOURCE_ROOT; };
26+
B548C5ED1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissTextField.swift; path = Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift; sourceTree = SOURCE_ROOT; };
2727
B56BC42A1C89A7EA00C20AD6 /* ICInputAccessory.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ICInputAccessory.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2828
B56BC42D1C89A7EA00C20AD6 /* ICInputAccessory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ICInputAccessory.h; sourceTree = "<group>"; };
2929
B56BC42F1C89A7EA00C20AD6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
30-
B56BC4351C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissAccessoryView.swift; path = Source/ICKeyboardDismissAccessoryView.swift; sourceTree = SOURCE_ROOT; };
30+
B56BC4351C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ICKeyboardDismissAccessoryView.swift; path = Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift; sourceTree = SOURCE_ROOT; };
3131
/* End PBXFileReference section */
3232

3333
/* Begin PBXFrameworksBuildPhase section */

‎Podfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ xcodeproj "ICInputAccessory"
66
xcodeproj "Example/Example"
77

88
target :Example do
9-
pod "ICInputAccessory", path: "./"
9+
pod "ICInputAccessory/KeyboardDismissTextField", path: "./"
10+
pod "ICInputAccessory/TokenField", path: "./"
1011
end

‎Podfile.lock‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
PODS:
2-
- ICInputAccessory (1.0.0)
2+
- ICInputAccessory/KeyboardDismissTextField (1.0.0)
3+
- ICInputAccessory/TokenField (1.0.0)
34

45
DEPENDENCIES:
5-
- ICInputAccessory (from `./`)
6+
- ICInputAccessory/KeyboardDismissTextField (from `./`)
7+
- ICInputAccessory/TokenField (from `./`)
68

79
EXTERNAL SOURCES:
810
ICInputAccessory:
911
:path: "./"
1012

1113
SPEC CHECKSUMS:
12-
ICInputAccessory: 341225aaa67a035b266880a5795001b363d1b1da
14+
ICInputAccessory: e3c0705263aa7c86cebf96425c95aa716ec83f25
1315

1416
COCOAPODS: 0.39.0

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Try <https://testflight.icook.tw>.
2020
* Customizable icon and colors.
2121
* Supports storyboard.
2222

23-
![ICTokenField](https://raw.githubusercontent.com/polydice/ICInputAccessory/gh-pages/screenshots/ICTokenField.gif)
23+
![ICTokenField](https://polydice.github.io/ICInputAccessory/screenshots/ICTokenField.gif)
2424

2525
## Requirements
2626

@@ -40,13 +40,14 @@ iOS 8.0+ with Xcode 7.2 or above.
4040

4141
### Install via [CocoaPods](http://guides.cocoapods.org/)
4242

43-
* Create a `Podfile` with the following specification and run `pod install`.
43+
* **ICInputAccessory** supports subspecs. Create a `Podfile` with the following specification and run `pod install`.
4444

4545
```rb
4646
platform :ios, '8.0'
4747
use_frameworks!
4848

49-
pod 'ICInputAccessory'
49+
pod 'ICInputAccessory/TokenField'
50+
pod 'ICInputAccessory/KeyboardDismissTextField'
5051
```
5152

5253
### Install Manually

Source/ICKeyboardDismissAccessoryView.swift renamed to Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift

File renamed without changes.

Source/ICKeyboardDismissTextField.swift renamed to Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift

File renamed without changes.

Source/Images.xcassets/Contents.json renamed to Source/KeyboardDismissTextField/Images.xcassets/Contents.json

File renamed without changes.

Source/Images.xcassets/icook-iphone-button-hide-keyboard.imageset/Contents.json renamed to Source/KeyboardDismissTextField/Images.xcassets/icook-iphone-button-hide-keyboard.imageset/Contents.json

File renamed without changes.

Source/Images.xcassets/icook-iphone-button-hide-keyboard.imageset/icook-iphone-button-hide-keyboard.pdf renamed to Source/KeyboardDismissTextField/Images.xcassets/icook-iphone-button-hide-keyboard.imageset/icook-iphone-button-hide-keyboard.pdf

File renamed without changes.

0 commit comments

Comments
 (0)