diff --git a/.swift-version b/.swift-version
index 13d683ccb..a0cd9f0cc 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-3.0.1
\ No newline at end of file
+3.1.0
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 49fe492b7..25d5a4a7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: objective-c
-osx_image: xcode8.1
+osx_image: xcode8.3
script:
- set -o pipefail
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6434a95a0..823bacc5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### 3.1.0 (May 29, 2017)
+
+* swiftlint 0.13 support & Xcode 8.2 compatibility [#253](https://github.com/badoo/Chatto/pull/253) - [@diegosanchezr](https://github.com/diegosanchezr)
+* swiftlint 0.14 support & hashes improvements [#271](https://github.com/badoo/Chatto/pull/271) - [@diegosanchezr](https://github.com/diegosanchezr)
+* Removed lazy keyword from accessoryTimestampView property in BaseMessageCollectionViewCell [#286](https://github.com/badoo/Chatto/pull/286) - [@geegaset](https://github.com/geegaset)
+* Fixed typo in a comment in BaseChatViewController+Changes.swift [#296](https://github.com/badoo/Chatto/pull/296) - [@NickAger](https://github.com/NickAger)
+* BasicChatInputBarPresenter.chatInputBar became public [#297](https://github.com/badoo/Chatto/pull/297) - [@NickAger](https://github.com/NickAger)
+* Added ability to specify tint color for text input [#301](https://github.com/badoo/Chatto/pull/301) - [@V0idPRO](https://github.com/V0idPRO)
+* Xcode 8.3 compatibility [#300](https://github.com/badoo/Chatto/pull/300) - [@geegaset](https://github.com/geegaset)
+* Empty layout model is returned if layout delegate is nil [#304](https://github.com/badoo/Chatto/pull/304) - [@chupakabr](https://github.com/chupakabr)
+
### 3.0.1 (Nov 14, 2016)
* Swift 3.0.1 / Xcode 8.1 support [#233](https://github.com/badoo/Chatto/pull/233) - [@diegosanchezr](https://github.com/diegosanchezr)
* Fixes weird linker issue with Carthage [#232](https://github.com/badoo/Chatto/pull/232) - [@zwang](https://github.com/zwang)
diff --git a/Chatto.podspec b/Chatto.podspec
index 719695d0b..542c4ac55 100644
--- a/Chatto.podspec
+++ b/Chatto.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Chatto"
- s.version = "3.0.1"
+ s.version = "3.1.0"
s.summary = "Chat framework in Swift"
s.description = <<-DESC
Lightweight chat framework to build Chat apps
diff --git a/Chatto/Source/Info.plist b/Chatto/Source/Info.plist
index dc2b99a3b..543e5f92d 100644
--- a/Chatto/Source/Info.plist
+++ b/Chatto/Source/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.0.1
+ 3.1.0
CFBundleSignature
????
CFBundleVersion
diff --git a/ChattoAdditions.podspec b/ChattoAdditions.podspec
index 29101d45b..8558580a2 100644
--- a/ChattoAdditions.podspec
+++ b/ChattoAdditions.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ChattoAdditions"
- s.version = "3.0.1"
+ s.version = "3.1.0"
s.summary = "UI componentes for Chatto"
s.description = <<-DESC
Text and photo bubbles
diff --git a/ChattoAdditions/Source/Info.plist b/ChattoAdditions/Source/Info.plist
index dc2b99a3b..d353b3ef2 100644
--- a/ChattoAdditions/Source/Info.plist
+++ b/ChattoAdditions/Source/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.0.1
+ 3.1.1
CFBundleSignature
????
CFBundleVersion
diff --git a/ChattoApp/ChattoApp.xcodeproj/project.pbxproj b/ChattoApp/ChattoApp.xcodeproj/project.pbxproj
index 5d2e54057..a270491c1 100644
--- a/ChattoApp/ChattoApp.xcodeproj/project.pbxproj
+++ b/ChattoApp/ChattoApp.xcodeproj/project.pbxproj
@@ -380,7 +380,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
+ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
F8D7533B1E7B2E137B143EBD /* [CP] Copy Pods Resources */ = {
diff --git a/ChattoApp/Podfile.lock b/ChattoApp/Podfile.lock
index 144e1b8e0..359c37730 100644
--- a/ChattoApp/Podfile.lock
+++ b/ChattoApp/Podfile.lock
@@ -1,6 +1,6 @@
PODS:
- - Chatto (3.0.1)
- - ChattoAdditions (3.0.1):
+ - Chatto (3.1.0)
+ - ChattoAdditions (3.1.0):
- Chatto
DEPENDENCIES:
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
:path: ".."
SPEC CHECKSUMS:
- Chatto: 760a1577da85ce75821fc5a4ecdd89c17fab2cd7
- ChattoAdditions: e44d3aaf236af16735c58c711d289250d4bc85f7
+ Chatto: dc39056aed56fcababb857affd8152606afb2b5a
+ ChattoAdditions: 4f54c932c08488fca0a85f211094276f03f4ee60
PODFILE CHECKSUM: 1d3260c9c7c4e7959c1f82d6d23323008391b149
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.1
diff --git a/ChattoApp/Pods/Local Podspecs/Chatto.podspec.json b/ChattoApp/Pods/Local Podspecs/Chatto.podspec.json
index 4ee6ab715..2dc6e7575 100644
--- a/ChattoApp/Pods/Local Podspecs/Chatto.podspec.json
+++ b/ChattoApp/Pods/Local Podspecs/Chatto.podspec.json
@@ -1,6 +1,6 @@
{
"name": "Chatto",
- "version": "3.0.1",
+ "version": "3.1.0",
"summary": "Chat framework in Swift",
"description": "Lightweight chat framework to build Chat apps",
"homepage": "https://github.com/badoo/Chatto",
@@ -15,7 +15,7 @@
},
"source": {
"git": "https://github.com/badoo/Chatto.git",
- "tag": "3.0.1"
+ "tag": "3.1.0"
},
"source_files": "Chatto/Source/**/*.{h,m,swift}",
"public_header_files": "Chatto/Source/**/*.h",
diff --git a/ChattoApp/Pods/Local Podspecs/ChattoAdditions.podspec.json b/ChattoApp/Pods/Local Podspecs/ChattoAdditions.podspec.json
index fa79c896d..1ed19c7ce 100644
--- a/ChattoApp/Pods/Local Podspecs/ChattoAdditions.podspec.json
+++ b/ChattoApp/Pods/Local Podspecs/ChattoAdditions.podspec.json
@@ -1,6 +1,6 @@
{
"name": "ChattoAdditions",
- "version": "3.0.1",
+ "version": "3.1.0",
"summary": "UI componentes for Chatto",
"description": "Text and photo bubbles\nInput bar for text and photo messages",
"homepage": "https://github.com/badoo/Chatto",
@@ -15,7 +15,7 @@
},
"source": {
"git": "https://github.com/badoo/Chatto.git",
- "tag": "3.0.1"
+ "tag": "3.1.0"
},
"source_files": "ChattoAdditions/Source/**/*.{h,m,swift}",
"public_header_files": "ChattoAdditions/Source/**/*.h",
diff --git a/ChattoApp/Pods/Manifest.lock b/ChattoApp/Pods/Manifest.lock
index 144e1b8e0..359c37730 100644
--- a/ChattoApp/Pods/Manifest.lock
+++ b/ChattoApp/Pods/Manifest.lock
@@ -1,6 +1,6 @@
PODS:
- - Chatto (3.0.1)
- - ChattoAdditions (3.0.1):
+ - Chatto (3.1.0)
+ - ChattoAdditions (3.1.0):
- Chatto
DEPENDENCIES:
@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
:path: ".."
SPEC CHECKSUMS:
- Chatto: 760a1577da85ce75821fc5a4ecdd89c17fab2cd7
- ChattoAdditions: e44d3aaf236af16735c58c711d289250d4bc85f7
+ Chatto: dc39056aed56fcababb857affd8152606afb2b5a
+ ChattoAdditions: 4f54c932c08488fca0a85f211094276f03f4ee60
PODFILE CHECKSUM: 1d3260c9c7c4e7959c1f82d6d23323008391b149
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.1
diff --git a/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj b/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj
index 627b190b8..7a3c8b1bc 100644
--- a/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj
+++ b/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
005FC66599DA4E9CD7C6B49E59D73B43 /* PhotosInputDataProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA74C6FA4698B48048CEF5C23B4D60FF /* PhotosInputDataProvider.swift */; };
00E795F3E959B17BD959E65ACE3A8B80 /* ChatInputItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 489B76A63AC8AE96C7D9AB8BE604DB38 /* ChatInputItemView.swift */; };
00E7CFDA07DB9D3C1349719B5F30B4DA /* SerialTaskQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = E89F916D99A1180299922EB3BE164AFA /* SerialTaskQueue.swift */; };
- 029E291FC911A28A11BB900078E2664D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC366F31D64FF6F5CFA32A39F0979377 /* Foundation.framework */; };
09C3BA0AC03C054EF21C73B417C47F0B /* ChatItemProtocolDefinitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D46E991C6D9AEA22D702952C55325 /* ChatItemProtocolDefinitions.swift */; };
0A99B2C4A81C74D7C31D0E517987C1F5 /* CircleIconView.m in Sources */ = {isa = PBXBuildFile; fileRef = D867A670787A7352B3B81ED19FE5A7EF /* CircleIconView.m */; };
0E3A877EFED45D642822D20A5E9130ED /* DummyChatItemPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC9D06B156044BFD612301944D5EE108 /* DummyChatItemPresenter.swift */; };
@@ -30,11 +29,9 @@
276A697903A616DDE97E5DF1392FE76C /* PhotoMessageCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7FB07C7AA705C13B7F2884D8C4E4D52 /* PhotoMessageCollectionViewCell.swift */; };
3120C8AAA6C1EFF4F65D57BFBDBD082D /* BaseMessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA90BE515B2095FA2AC5C54FEB9ED51D /* BaseMessageModel.swift */; };
345A3F586F06EE6295592C96274AC6A1 /* BaseMessageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96402187D4C05CEFBCD217A5B52D41CE /* BaseMessageViewModel.swift */; };
- 385C5E82EF6EC1F9266117C9632A8B3F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC366F31D64FF6F5CFA32A39F0979377 /* Foundation.framework */; };
38604BF882154EAE8FCE25F388CB676C /* PhotoMessageCollectionViewCellDefaultStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2DC506829E1BD918CEAF95D49131A91 /* PhotoMessageCollectionViewCellDefaultStyle.swift */; };
3AFCF8BD14A727B60317F765E63BA5A3 /* ChatDataSourceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8284E5CBE4A071FF40F6A671DEC2421 /* ChatDataSourceProtocol.swift */; };
44E3AAB8E0C29C6270D3A3130506A3B9 /* TextMessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB02ED1F2E01B87195E665A464B6E23E /* TextMessageModel.swift */; };
- 451BC7A753EE7E658E4AAEB045E41F5C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC366F31D64FF6F5CFA32A39F0979377 /* Foundation.framework */; };
4F95B1B06C002B73BBF290495D2CDB76 /* LiveCameraCellPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02D1546D844B52275BCB5F87AECC0D31 /* LiveCameraCellPresenter.swift */; };
54B4530688F6EC423AACEF083D286FF9 /* KeyboardTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95FE43AE16BC2356351CE54411E7A09B /* KeyboardTracker.swift */; };
551E32A56BA1409332FCA489D1F2BD18 /* BaseChatItemPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191AD5777B77BF6B5AD967A434ACDFEE /* BaseChatItemPresenter.swift */; };
@@ -45,6 +42,8 @@
7365DF889974361D2102835E83B03FC4 /* Text.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2A0D073A6C8292215CF9C18BDE409BE1 /* Text.xcassets */; };
75B4F40CC7A7364FF9F0C275F264C52C /* PhotosChatInputItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7007A799EF57F96DB1EFD516442F5AA /* PhotosChatInputItem.swift */; };
75F72B1DE2BB065C1B398072D130FEFA /* ChattoAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A81A00458F0E377DDA187019D579795 /* ChattoAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 77E6F472B22328E2F6962FB06D4E8475 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9FB20ED66AF2A93EB50539902AE6733 /* Foundation.framework */; };
+ 7F663761FE373B0CB90C3906DC50E832 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9FB20ED66AF2A93EB50539902AE6733 /* Foundation.framework */; };
801157F398C18E8E04D432E6F67DE204 /* BaseMessageCollectionViewCellDefaultStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AA62132C3948993C67F88372C6B584C /* BaseMessageCollectionViewCellDefaultStyle.swift */; };
84C0E170146FF3AE917C0F70D7ABE740 /* BaseChatViewController+Presenters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 073E6EA5A36F5D62CADA17515C40FCA7 /* BaseChatViewController+Presenters.swift */; };
8CC0D4C0C44B2FD93607AE62CDA4935D /* HorizontalStackScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23602E61546717BB32B1001CF4C0C31F /* HorizontalStackScrollView.swift */; };
@@ -65,6 +64,7 @@
AB66066339703AF177504A94913154AF /* Chatto.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B5D4369BA1DB086393AC1B9A92A22E5 /* Chatto.h */; settings = {ATTRIBUTES = (Public, ); }; };
AF1C8CEB44917863DB139993D0F43120 /* LiveCameraCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE6D840A010DB7D81CE59C340CC978E /* LiveCameraCell.swift */; };
B164B7421F5F4173941546E50D604674 /* TextMessageCollectionViewCellDefaultStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E00521A87A02865E0488C620301682 /* TextMessageCollectionViewCellDefaultStyle.swift */; };
+ B7C56B89014CC81A6A2AD99DAFE3756A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9FB20ED66AF2A93EB50539902AE6733 /* Foundation.framework */; };
BB94DF7E88E3169DCBF79018AB5A02F9 /* CircleProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFA9B30C03C779DCB556C05A9770D4A /* CircleProgressView.m */; };
BD141065E2387E1E44C12759AC4E84D9 /* Photos.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2B2293D7D418420AB03F0584A71EB69 /* Photos.xcassets */; };
BEBEDDB6DB64A74879929323D7FF3BE0 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AC89C37B73E5085F85C15F6D398BC06 /* Utils.swift */; };
@@ -186,7 +186,6 @@
A65DE185A12E70BE17EFA373F195C9E6 /* Chatto.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = Chatto.xcconfig; sourceTree = ""; };
A8AFCDC34A96C2B57F7A1C1A332382CB /* Pods-ChattoApp-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-ChattoApp-resources.sh"; sourceTree = ""; };
AB02ED1F2E01B87195E665A464B6E23E /* TextMessageModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TextMessageModel.swift; sourceTree = ""; };
- AC366F31D64FF6F5CFA32A39F0979377 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
AF3827E052F4369A86F32B555BFE2E80 /* Chatto-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Chatto-prefix.pch"; sourceTree = ""; };
AF5BD772CABAA008A4802F6B3A73307E /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
B20598F484478DFEE1B31B07C6FA131F /* Pods-ChattoApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-ChattoApp.release.xcconfig"; sourceTree = ""; };
@@ -200,6 +199,7 @@
C117BD8C68DD05EFED4E96C19B341962 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
C2E90819091BCEF228F57100FF8C977E /* ReadOnlyOrderedDictionary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ReadOnlyOrderedDictionary.swift; sourceTree = ""; };
C5CB3BCEEF59DC9F22F70C7D1B1E98F5 /* Pods-ChattoApp-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-ChattoApp-acknowledgements.plist"; sourceTree = ""; };
+ C9FB20ED66AF2A93EB50539902AE6733 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
CE933845F288AD8CAAEE30168C29BD06 /* ChatInputItem.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ChatInputItem.swift; sourceTree = ""; };
D016FA4F1D50FC449EAEC236D1E6F954 /* PhotosInputView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PhotosInputView.swift; sourceTree = ""; };
D0A636ED63D4950987B5410B6B50F1B4 /* Chatto.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Chatto.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -233,7 +233,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 451BC7A753EE7E658E4AAEB045E41F5C /* Foundation.framework in Frameworks */,
+ 77E6F472B22328E2F6962FB06D4E8475 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -241,7 +241,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 385C5E82EF6EC1F9266117C9632A8B3F /* Foundation.framework in Frameworks */,
+ 7F663761FE373B0CB90C3906DC50E832 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -250,7 +250,7 @@
buildActionMask = 2147483647;
files = (
D1703E4D78CDB5570AFD9E179DB04381 /* Chatto.framework in Frameworks */,
- 029E291FC911A28A11BB900078E2664D /* Foundation.framework in Frameworks */,
+ B7C56B89014CC81A6A2AD99DAFE3756A /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -288,6 +288,14 @@
name = Resources;
sourceTree = "";
};
+ 0F33BDD36546B9902C41911E4D2265FE /* iOS */ = {
+ isa = PBXGroup;
+ children = (
+ C9FB20ED66AF2A93EB50539902AE6733 /* Foundation.framework */,
+ );
+ name = iOS;
+ sourceTree = "";
+ };
0F47DF814D4816A9329AB2C324D99A8D /* Chat Items */ = {
isa = PBXGroup;
children = (
@@ -351,14 +359,6 @@
path = PhotoMessages;
sourceTree = "";
};
- 2C62B942C64204808FEB860B15CEBF66 /* iOS */ = {
- isa = PBXGroup;
- children = (
- AC366F31D64FF6F5CFA32A39F0979377 /* Foundation.framework */,
- );
- name = iOS;
- sourceTree = "";
- };
3882A61CF128C4409DEE2E421E4EA59D /* Chatto */ = {
isa = PBXGroup;
children = (
@@ -501,7 +501,7 @@
isa = PBXGroup;
children = (
D0A636ED63D4950987B5410B6B50F1B4 /* Chatto.framework */,
- 2C62B942C64204808FEB860B15CEBF66 /* iOS */,
+ 0F33BDD36546B9902C41911E4D2265FE /* iOS */,
);
name = Frameworks;
sourceTree = "";
@@ -836,7 +836,7 @@
D41D8CD98F00B204E9800998ECF8427E /* Project object */ = {
isa = PBXProject;
attributes = {
- LastSwiftUpdateCheck = 0730;
+ LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0700;
};
buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
@@ -989,54 +989,11 @@
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
- 015A368F878AC3E2CEAE21DDE8026304 /* Debug */ = {
+ 1E94ADB1C116C685D63FABBEC4A4CCE8 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = DD7E5A5969A01E3A504D0135C6F25CFF /* ChattoAdditions.xcconfig */;
buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGNING_REQUIRED = NO;
- COPY_PHASE_STRIP = NO;
- ENABLE_TESTABILITY = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "POD_CONFIGURATION_DEBUG=1",
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
- ONLY_ACTIVE_ARCH = YES;
- PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
- STRIP_INSTALLED_PRODUCT = NO;
- SYMROOT = "${SRCROOT}/../build";
- };
- name = Debug;
- };
- 24A84D72706510936AD0D689FF46493C /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = A65DE185A12E70BE17EFA373F195C9E6 /* Chatto.xcconfig */;
- buildSettings = {
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
@@ -1048,16 +1005,17 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREFIX_HEADER = "Target Support Files/Chatto/Chatto-prefix.pch";
- INFOPLIST_FILE = "Target Support Files/Chatto/Info.plist";
+ GCC_PREFIX_HEADER = "Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch";
+ INFOPLIST_FILE = "Target Support Files/ChattoAdditions/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MODULEMAP_FILE = "Target Support Files/Chatto/Chatto.modulemap";
+ MODULEMAP_FILE = "Target Support Files/ChattoAdditions/ChattoAdditions.modulemap";
MTL_ENABLE_DEBUG_INFO = NO;
- PRODUCT_NAME = Chatto;
+ PRODUCT_NAME = ChattoAdditions;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
@@ -1065,11 +1023,12 @@
};
name = Release;
};
- 44CDBB6D11DE06DB64D6268622BDC47E /* Release */ = {
+ 34FE9531DA9AF2820790339988D5FF41 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -1077,10 +1036,13 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGNING_REQUIRED = NO;
@@ -1105,10 +1067,11 @@
};
name = Release;
};
- 77D6F01693DB9B04FED3B798FB69AF0A /* Debug */ = {
+ 367688BEE91584AA215A050C446C27F2 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = DD7E5A5969A01E3A504D0135C6F25CFF /* ChattoAdditions.xcconfig */;
+ baseConfigurationReference = 9661D8308C0146658FC05299FF59AA85 /* Pods-ChattoApp.debug.xcconfig */;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
@@ -1120,16 +1083,21 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREFIX_HEADER = "Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch";
- INFOPLIST_FILE = "Target Support Files/ChattoAdditions/Info.plist";
+ INFOPLIST_FILE = "Target Support Files/Pods-ChattoApp/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MODULEMAP_FILE = "Target Support Files/ChattoAdditions/ChattoAdditions.modulemap";
+ MACH_O_TYPE = staticlib;
+ MODULEMAP_FILE = "Target Support Files/Pods-ChattoApp/Pods-ChattoApp.modulemap";
MTL_ENABLE_DEBUG_INFO = YES;
- PRODUCT_NAME = ChattoAdditions;
+ OTHER_LDFLAGS = "";
+ OTHER_LIBTOOLFLAGS = "";
+ PODS_ROOT = "$(SRCROOT)";
+ PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
+ PRODUCT_NAME = Pods_ChattoApp;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1138,10 +1106,11 @@
};
name = Debug;
};
- AF9A662B207FA844AB696A0165A89723 /* Release */ = {
+ 49FEDEDD944E24055CF1916688C1CE03 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B20598F484478DFEE1B31B07C6FA131F /* Pods-ChattoApp.release.xcconfig */;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
@@ -1167,16 +1136,19 @@
PRODUCT_NAME = Pods_ChattoApp;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
- D5570EFD5E68AD814CB00CAE5F8E65B9 /* Debug */ = {
+ 9DBD84ECA9348E238D51B1C31C117A0D /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 9661D8308C0146658FC05299FF59AA85 /* Pods-ChattoApp.debug.xcconfig */;
+ baseConfigurationReference = DD7E5A5969A01E3A504D0135C6F25CFF /* ChattoAdditions.xcconfig */;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
@@ -1188,36 +1160,83 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
- INFOPLIST_FILE = "Target Support Files/Pods-ChattoApp/Info.plist";
+ GCC_PREFIX_HEADER = "Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch";
+ INFOPLIST_FILE = "Target Support Files/ChattoAdditions/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MACH_O_TYPE = staticlib;
- MODULEMAP_FILE = "Target Support Files/Pods-ChattoApp/Pods-ChattoApp.modulemap";
+ MODULEMAP_FILE = "Target Support Files/ChattoAdditions/ChattoAdditions.modulemap";
MTL_ENABLE_DEBUG_INFO = YES;
- OTHER_LDFLAGS = "";
- OTHER_LIBTOOLFLAGS = "";
- PODS_ROOT = "$(SRCROOT)";
- PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}";
- PRODUCT_NAME = Pods_ChattoApp;
+ PRODUCT_NAME = ChattoAdditions;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
- EC9E1A5E77474D438739D7781218B541 /* Debug */ = {
+ C104F7F091290C3D1E248192F07FE689 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGNING_REQUIRED = NO;
+ COPY_PHASE_STRIP = NO;
+ ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu99;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "POD_CONFIGURATION_DEBUG=1",
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ ONLY_ACTIVE_ARCH = YES;
+ PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
+ STRIP_INSTALLED_PRODUCT = NO;
+ SYMROOT = "${SRCROOT}/../build";
+ };
+ name = Debug;
+ };
+ D1A875211CF4A36C8A002858CA774782 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A65DE185A12E70BE17EFA373F195C9E6 /* Chatto.xcconfig */;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
CURRENT_PROJECT_VERSION = 1;
- DEBUG_INFORMATION_FORMAT = dwarf;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -1230,49 +1249,52 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = "Target Support Files/Chatto/Chatto.modulemap";
- MTL_ENABLE_DEBUG_INFO = YES;
+ MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = Chatto;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
- SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
- name = Debug;
+ name = Release;
};
- F3D0D59918FC16A7C4D2DAAC4C93B432 /* Release */ = {
+ E4FA5B55D624A32933E6772AEDB9C2C5 /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = DD7E5A5969A01E3A504D0135C6F25CFF /* ChattoAdditions.xcconfig */;
+ baseConfigurationReference = A65DE185A12E70BE17EFA373F195C9E6 /* Chatto.xcconfig */;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
CURRENT_PROJECT_VERSION = 1;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES;
- GCC_PREFIX_HEADER = "Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch";
- INFOPLIST_FILE = "Target Support Files/ChattoAdditions/Info.plist";
+ GCC_PREFIX_HEADER = "Target Support Files/Chatto/Chatto-prefix.pch";
+ INFOPLIST_FILE = "Target Support Files/Chatto/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
- MODULEMAP_FILE = "Target Support Files/ChattoAdditions/ChattoAdditions.modulemap";
- MTL_ENABLE_DEBUG_INFO = NO;
- PRODUCT_NAME = ChattoAdditions;
+ MODULEMAP_FILE = "Target Support Files/Chatto/Chatto.modulemap";
+ MTL_ENABLE_DEBUG_INFO = YES;
+ PRODUCT_NAME = Chatto;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
- name = Release;
+ name = Debug;
};
/* End XCBuildConfiguration section */
@@ -1280,8 +1302,8 @@
0C6B695FB9120E769A46CB6A2BE56E58 /* Build configuration list for PBXNativeTarget "Chatto" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- EC9E1A5E77474D438739D7781218B541 /* Debug */,
- 24A84D72706510936AD0D689FF46493C /* Release */,
+ E4FA5B55D624A32933E6772AEDB9C2C5 /* Debug */,
+ D1A875211CF4A36C8A002858CA774782 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -1289,8 +1311,8 @@
1ACE60E84B8FD1DA1F249B79678D2A4E /* Build configuration list for PBXNativeTarget "Pods-ChattoApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- D5570EFD5E68AD814CB00CAE5F8E65B9 /* Debug */,
- AF9A662B207FA844AB696A0165A89723 /* Release */,
+ 367688BEE91584AA215A050C446C27F2 /* Debug */,
+ 49FEDEDD944E24055CF1916688C1CE03 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -1298,8 +1320,8 @@
2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 015A368F878AC3E2CEAE21DDE8026304 /* Debug */,
- 44CDBB6D11DE06DB64D6268622BDC47E /* Release */,
+ C104F7F091290C3D1E248192F07FE689 /* Debug */,
+ 34FE9531DA9AF2820790339988D5FF41 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -1307,8 +1329,8 @@
481E380F5F5E73F3749437F09B430BF6 /* Build configuration list for PBXNativeTarget "ChattoAdditions" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 77D6F01693DB9B04FED3B798FB69AF0A /* Debug */,
- F3D0D59918FC16A7C4D2DAAC4C93B432 /* Release */,
+ 9DBD84ECA9348E238D51B1C31C117A0D /* Debug */,
+ 1E94ADB1C116C685D63FABBEC4A4CCE8 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
diff --git a/ChattoApp/Pods/Target Support Files/Chatto/Chatto-prefix.pch b/ChattoApp/Pods/Target Support Files/Chatto/Chatto-prefix.pch
index aa992a4ad..beb2a2441 100644
--- a/ChattoApp/Pods/Target Support Files/Chatto/Chatto-prefix.pch
+++ b/ChattoApp/Pods/Target Support Files/Chatto/Chatto-prefix.pch
@@ -1,4 +1,12 @@
#ifdef __OBJC__
#import
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
#endif
diff --git a/ChattoApp/Pods/Target Support Files/Chatto/Chatto-umbrella.h b/ChattoApp/Pods/Target Support Files/Chatto/Chatto-umbrella.h
index 12b97a86a..8a919bf65 100644
--- a/ChattoApp/Pods/Target Support Files/Chatto/Chatto-umbrella.h
+++ b/ChattoApp/Pods/Target Support Files/Chatto/Chatto-umbrella.h
@@ -1,5 +1,13 @@
#ifdef __OBJC__
#import
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
#endif
#import "Chatto.h"
diff --git a/ChattoApp/Pods/Target Support Files/Chatto/Chatto.xcconfig b/ChattoApp/Pods/Target Support Files/Chatto/Chatto.xcconfig
index b9bc18fad..92a0b1867 100644
--- a/ChattoApp/Pods/Target Support Files/Chatto/Chatto.xcconfig
+++ b/ChattoApp/Pods/Target Support Files/Chatto/Chatto.xcconfig
@@ -5,5 +5,6 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
diff --git a/ChattoApp/Pods/Target Support Files/Chatto/Info.plist b/ChattoApp/Pods/Target Support Files/Chatto/Info.plist
index b0b461e32..90db36aa4 100644
--- a/ChattoApp/Pods/Target Support Files/Chatto/Info.plist
+++ b/ChattoApp/Pods/Target Support Files/Chatto/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.0.1
+ 3.1.0
CFBundleSignature
????
CFBundleVersion
diff --git a/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch b/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch
index aa992a4ad..beb2a2441 100644
--- a/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch
+++ b/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-prefix.pch
@@ -1,4 +1,12 @@
#ifdef __OBJC__
#import
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
#endif
diff --git a/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-umbrella.h b/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-umbrella.h
index c24f6a13a..f673a102a 100644
--- a/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-umbrella.h
+++ b/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions-umbrella.h
@@ -1,5 +1,13 @@
#ifdef __OBJC__
#import
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
#endif
#import "ChattoAdditions.h"
diff --git a/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions.xcconfig b/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions.xcconfig
index a6a908cdb..0ac440ba6 100644
--- a/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions.xcconfig
+++ b/ChattoApp/Pods/Target Support Files/ChattoAdditions/ChattoAdditions.xcconfig
@@ -6,5 +6,6 @@ OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
diff --git a/ChattoApp/Pods/Target Support Files/ChattoAdditions/Info.plist b/ChattoApp/Pods/Target Support Files/ChattoAdditions/Info.plist
index b0b461e32..90db36aa4 100644
--- a/ChattoApp/Pods/Target Support Files/ChattoAdditions/Info.plist
+++ b/ChattoApp/Pods/Target Support Files/ChattoAdditions/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.0.1
+ 3.1.0
CFBundleSignature
????
CFBundleVersion
diff --git a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-frameworks.sh b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-frameworks.sh
index 2a5f3e962..826900d9c 100755
--- a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-frameworks.sh
+++ b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-frameworks.sh
@@ -59,8 +59,13 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
- echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
- /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
+ local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+
+ if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
+ code_sign_cmd="$code_sign_cmd &"
+ fi
+ echo "$code_sign_cmd"
+ eval "$code_sign_cmd"
fi
}
@@ -91,3 +96,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/Chatto/Chatto.framework"
install_framework "$BUILT_PRODUCTS_DIR/ChattoAdditions/ChattoAdditions.framework"
fi
+if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
+ wait
+fi
diff --git a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-resources.sh b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-resources.sh
index 25e9d3775..aed060f04 100755
--- a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-resources.sh
+++ b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-resources.sh
@@ -18,6 +18,12 @@ case "${TARGETED_DEVICE_FAMILY}" in
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
+ 3)
+ TARGET_DEVICE_ARGS="--target-device tv"
+ ;;
+ 4)
+ TARGET_DEVICE_ARGS="--target-device watch"
+ ;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
diff --git a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-umbrella.h b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-umbrella.h
index 7d0fe528e..21cad907b 100644
--- a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-umbrella.h
+++ b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp-umbrella.h
@@ -1,5 +1,13 @@
#ifdef __OBJC__
#import
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
#endif
diff --git a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.debug.xcconfig b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.debug.xcconfig
index f619dedb8..43b9bd5a2 100644
--- a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.debug.xcconfig
+++ b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.debug.xcconfig
@@ -1,5 +1,4 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Chatto" "$PODS_CONFIGURATION_BUILD_DIR/ChattoAdditions"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
@@ -8,4 +7,5 @@ OTHER_LDFLAGS = $(inherited) -framework "Chatto" -framework "ChattoAdditions"
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_ROOT = ${SRCROOT}/Pods
diff --git a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.release.xcconfig b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.release.xcconfig
index f619dedb8..43b9bd5a2 100644
--- a/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.release.xcconfig
+++ b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.release.xcconfig
@@ -1,5 +1,4 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
-EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Chatto" "$PODS_CONFIGURATION_BUILD_DIR/ChattoAdditions"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
@@ -8,4 +7,5 @@ OTHER_LDFLAGS = $(inherited) -framework "Chatto" -framework "ChattoAdditions"
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
+PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
PODS_ROOT = ${SRCROOT}/Pods