Permalink
Browse files

Fix ParkedTextField for Swift 2.3

  • Loading branch information...
1 parent 3d609ce commit 4b35847ff47219668fbf7e7227c583edc9610c2e @chrisballinger chrisballinger committed Sep 15, 2016
Showing with 13 additions and 4 deletions.
  1. +3 −0 .gitmodules
  2. +4 −1 Podfile
  3. +5 −3 Podfile.lock
  4. +1 −0 Submodules/ParkedTextField
View
@@ -22,3 +22,6 @@
[submodule "Submodules/ChatSecure-Push-iOS"]
path = Submodules/ChatSecure-Push-iOS
url = git@github.com:ChatSecure/ChatSecure-Push-iOS.git
+[submodule "Submodules/ParkedTextField"]
+ path = Submodules/ParkedTextField
+ url = git@github.com:ChatSecure/ParkedTextField.git
View
@@ -52,7 +52,7 @@ abstract_target 'ChatSecureCorePods' do
#Reachability only needed for YapActionItems
pod 'Reachability', '~> 3'
pod 'XLForm', '~> 3.1'
- pod 'ParkedTextField', '~> 0.2'
+ #pod 'ParkedTextField', '~> 0.2'
# QR Codes
pod 'QRCodeReaderViewController', '~> 4.0'
@@ -77,6 +77,9 @@ abstract_target 'ChatSecureCorePods' do
pod 'CPAProxy', :path => 'Submodules/CPAProxy/CPAProxy.podspec'
pod 'XMPPFramework', :path => 'Submodules/XMPPFramework/XMPPFramework.podspec'
pod 'IOCipher/GCDWebServer', :path => 'Submodules/IOCipher/IOCipher.podspec'
+ # Waiting for Swift 2.3 changes
+ pod 'ParkedTextField', :path => 'Submodules/ParkedTextField/ParkedTextField.podspec'
+
target 'ChatSecureCore'
target 'ChatSecureTests'
View
@@ -348,7 +348,7 @@ DEPENDENCIES:
- Navajo (~> 0.0)
- OpenInChrome (~> 0.0)
- OTRKit (from `Submodules/OTRKit/OTRKit.podspec`)
- - ParkedTextField (~> 0.2)
+ - ParkedTextField (from `Submodules/ParkedTextField/ParkedTextField.podspec`)
- ProxyKit/Client (from `Submodules/ProxyKit/ProxyKit.podspec`)
- PureLayout (~> 3.0)
- QRCodeReaderViewController (~> 4.0)
@@ -385,6 +385,8 @@ EXTERNAL SOURCES:
:podspec: Podspecs/libsqlfs.podspec
OTRKit:
:path: Submodules/OTRKit/OTRKit.podspec
+ ParkedTextField:
+ :path: Submodules/ParkedTextField/ParkedTextField.podspec
ProxyKit:
:path: Submodules/ProxyKit/ProxyKit.podspec
SQLCipher:
@@ -447,6 +449,6 @@ SPEC CHECKSUMS:
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
-PODFILE CHECKSUM: c643eeee089e78beaf39c3b1153623c43456bbc4
+PODFILE CHECKSUM: dc7a0cd572353ee917d7b98efa82287a89e1583c
-COCOAPODS: 1.1.0.rc.1
+COCOAPODS: 1.1.0.rc.2
Submodule ParkedTextField added at 5dbb93

0 comments on commit 4b35847

Please sign in to comment.