diff --git a/.swift-version b/.swift-version index a0cd9f0cc..944880fa1 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.1.0 \ No newline at end of file +3.2.0 diff --git a/Chatto.podspec b/Chatto.podspec index 542c4ac55..46401301f 100644 --- a/Chatto.podspec +++ b/Chatto.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Chatto" - s.version = "3.1.0" + s.version = "3.2.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 543e5f92d..340121d3f 100644 --- a/Chatto/Source/Info.plist +++ b/Chatto/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.0 + 3.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/ChattoAdditions.podspec b/ChattoAdditions.podspec index 8558580a2..9c039a3e5 100644 --- a/ChattoAdditions.podspec +++ b/ChattoAdditions.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ChattoAdditions" - s.version = "3.1.0" + s.version = "3.2.0" s.summary = "UI componentes for Chatto" s.description = <<-DESC Text and photo bubbles diff --git a/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenterBuilder.swift b/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenterBuilder.swift index c9e850ec1..004b6ac5c 100644 --- a/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenterBuilder.swift +++ b/ChattoAdditions/Source/Chat Items/PhotoMessages/PhotoMessagePresenterBuilder.swift @@ -42,7 +42,7 @@ open class PhotoMessagePresenterBuilder: public let viewModelBuilder: ViewModelBuilderT public let interactionHandler: InteractionHandlerT? - public lazy var sizingCell: PhotoMessageCollectionViewCell = PhotoMessageCollectionViewCell.sizingCell() + public let sizingCell: PhotoMessageCollectionViewCell = PhotoMessageCollectionViewCell.sizingCell() public lazy var photoCellStyle: PhotoMessageCollectionViewCellStyleProtocol = PhotoMessageCollectionViewCellDefaultStyle() public lazy var baseCellStyle: BaseMessageCollectionViewCellStyleProtocol = BaseMessageCollectionViewCellDefaultStyle() diff --git a/ChattoAdditions/Source/Info.plist b/ChattoAdditions/Source/Info.plist index d353b3ef2..340121d3f 100644 --- a/ChattoAdditions/Source/Info.plist +++ b/ChattoAdditions/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.1.1 + 3.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/ChattoApp/ChattoApp.xcodeproj/project.pbxproj b/ChattoApp/ChattoApp.xcodeproj/project.pbxproj index a270491c1..5d2e54057 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_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"; + 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"; showEnvVarsInLog = 0; }; F8D7533B1E7B2E137B143EBD /* [CP] Copy Pods Resources */ = { diff --git a/ChattoApp/Podfile.lock b/ChattoApp/Podfile.lock index 359c37730..baa4a1ca4 100644 --- a/ChattoApp/Podfile.lock +++ b/ChattoApp/Podfile.lock @@ -1,6 +1,6 @@ PODS: - - Chatto (3.1.0) - - ChattoAdditions (3.1.0): + - Chatto (3.2.0) + - ChattoAdditions (3.2.0): - Chatto DEPENDENCIES: @@ -9,14 +9,14 @@ DEPENDENCIES: EXTERNAL SOURCES: Chatto: - :path: ".." + :path: .. ChattoAdditions: - :path: ".." + :path: .. SPEC CHECKSUMS: - Chatto: dc39056aed56fcababb857affd8152606afb2b5a - ChattoAdditions: 4f54c932c08488fca0a85f211094276f03f4ee60 + Chatto: 49676707c36ccb831ecb23e0969b890b2da91f08 + ChattoAdditions: c4c8827790b9c9885002f6b91f210fd3632dc60a PODFILE CHECKSUM: 1d3260c9c7c4e7959c1f82d6d23323008391b149 -COCOAPODS: 1.2.1 +COCOAPODS: 1.2.0 diff --git a/ChattoApp/Pods/Local Podspecs/Chatto.podspec.json b/ChattoApp/Pods/Local Podspecs/Chatto.podspec.json index 2dc6e7575..6c9361e7b 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.1.0", + "version": "3.2.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.1.0" + "tag": "3.2.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 1ed19c7ce..8a35e847b 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.1.0", + "version": "3.2.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.1.0" + "tag": "3.2.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 359c37730..baa4a1ca4 100644 --- a/ChattoApp/Pods/Manifest.lock +++ b/ChattoApp/Pods/Manifest.lock @@ -1,6 +1,6 @@ PODS: - - Chatto (3.1.0) - - ChattoAdditions (3.1.0): + - Chatto (3.2.0) + - ChattoAdditions (3.2.0): - Chatto DEPENDENCIES: @@ -9,14 +9,14 @@ DEPENDENCIES: EXTERNAL SOURCES: Chatto: - :path: ".." + :path: .. ChattoAdditions: - :path: ".." + :path: .. SPEC CHECKSUMS: - Chatto: dc39056aed56fcababb857affd8152606afb2b5a - ChattoAdditions: 4f54c932c08488fca0a85f211094276f03f4ee60 + Chatto: 49676707c36ccb831ecb23e0969b890b2da91f08 + ChattoAdditions: c4c8827790b9c9885002f6b91f210fd3632dc60a PODFILE CHECKSUM: 1d3260c9c7c4e7959c1f82d6d23323008391b149 -COCOAPODS: 1.2.1 +COCOAPODS: 1.2.0 diff --git a/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj b/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj index 7a3c8b1bc..d9f17b3e0 100644 --- a/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj +++ b/ChattoApp/Pods/Pods.xcodeproj/project.pbxproj @@ -989,279 +989,282 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 1E94ADB1C116C685D63FABBEC4A4CCE8 /* Release */ = { + 05AD7E8891F96E2C8DF9EB13863AEB95 /* 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*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 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"; + 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"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = ChattoAdditions; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-ChattoApp/Pods-ChattoApp.modulemap"; + 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_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - 34FE9531DA9AF2820790339988D5FF41 /* Release */ = { + 27A052B71AFA5B1A83AB880CC7E603BC /* 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_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; 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_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_RELEASE=1", + "POD_CONFIGURATION_DEBUG=1", + "DEBUG=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; - VALIDATE_PRODUCT = YES; }; - name = Release; + name = Debug; }; - 367688BEE91584AA215A050C446C27F2 /* Debug */ = { + 711981F4D706BF3C48CFEDED2E50716E /* Release */ = { 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*]" = ""; CURRENT_PROJECT_VERSION = 1; - 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; - 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"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ChattoApp; + MODULEMAP_FILE = "Target Support Files/ChattoAdditions/ChattoAdditions.modulemap"; + PRODUCT_NAME = ChattoAdditions; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 49FEDEDD944E24055CF1916688C1CE03 /* Release */ = { + 830B0E86F8B718F4A4BA24CAF700EAD9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B20598F484478DFEE1B31B07C6FA131F /* Pods-ChattoApp.release.xcconfig */; + baseConfigurationReference = DD7E5A5969A01E3A504D0135C6F25CFF /* ChattoAdditions.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"; 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; - 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"; - MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_ChattoApp; + MODULEMAP_FILE = "Target Support Files/ChattoAdditions/ChattoAdditions.modulemap"; + PRODUCT_NAME = ChattoAdditions; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + 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; }; - 9DBD84ECA9348E238D51B1C31C117A0D /* Debug */ = { + 931A41D1AA4927DA958F5A2FB1AF81A9 /* Release */ = { 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; 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 = YES; - PRODUCT_NAME = ChattoAdditions; + MODULEMAP_FILE = "Target Support Files/Chatto/Chatto.modulemap"; + PRODUCT_NAME = Chatto; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - C104F7F091290C3D1E248192F07FE689 /* Debug */ = { + B254DAA6CF0CE39F4A3D11B90A7E059A /* 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_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; 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_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; 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; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1", + "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = YES; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; }; - name = Debug; + name = Release; }; - D1A875211CF4A36C8A002858CA774782 /* Release */ = { + D2ED66FEA840AD9201CB2CE3BF4F3C35 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A65DE185A12E70BE17EFA373F195C9E6 /* Chatto.xcconfig */; + 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*]" = ""; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 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/Chatto/Chatto-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/Chatto/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/Chatto/Chatto.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_NAME = Chatto; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-ChattoApp/Pods-ChattoApp.modulemap"; + 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_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - E4FA5B55D624A32933E6772AEDB9C2C5 /* Debug */ = { + F6D14F175D1DFF23A1B853426B80DF06 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = A65DE185A12E70BE17EFA373F195C9E6 /* Chatto.xcconfig */; buildSettings = { @@ -1270,20 +1273,16 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; CURRENT_PROJECT_VERSION = 1; - 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/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/Chatto/Chatto.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = Chatto; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -1302,8 +1301,8 @@ 0C6B695FB9120E769A46CB6A2BE56E58 /* Build configuration list for PBXNativeTarget "Chatto" */ = { isa = XCConfigurationList; buildConfigurations = ( - E4FA5B55D624A32933E6772AEDB9C2C5 /* Debug */, - D1A875211CF4A36C8A002858CA774782 /* Release */, + F6D14F175D1DFF23A1B853426B80DF06 /* Debug */, + 931A41D1AA4927DA958F5A2FB1AF81A9 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1311,8 +1310,8 @@ 1ACE60E84B8FD1DA1F249B79678D2A4E /* Build configuration list for PBXNativeTarget "Pods-ChattoApp" */ = { isa = XCConfigurationList; buildConfigurations = ( - 367688BEE91584AA215A050C446C27F2 /* Debug */, - 49FEDEDD944E24055CF1916688C1CE03 /* Release */, + 05AD7E8891F96E2C8DF9EB13863AEB95 /* Debug */, + D2ED66FEA840AD9201CB2CE3BF4F3C35 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1320,8 +1319,8 @@ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - C104F7F091290C3D1E248192F07FE689 /* Debug */, - 34FE9531DA9AF2820790339988D5FF41 /* Release */, + 27A052B71AFA5B1A83AB880CC7E603BC /* Debug */, + B254DAA6CF0CE39F4A3D11B90A7E059A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1329,8 +1328,8 @@ 481E380F5F5E73F3749437F09B430BF6 /* Build configuration list for PBXNativeTarget "ChattoAdditions" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9DBD84ECA9348E238D51B1C31C117A0D /* Debug */, - 1E94ADB1C116C685D63FABBEC4A4CCE8 /* Release */, + 830B0E86F8B718F4A4BA24CAF700EAD9 /* Debug */, + 711981F4D706BF3C48CFEDED2E50716E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/ChattoApp/Pods/Target Support Files/Chatto/Info.plist b/ChattoApp/Pods/Target Support Files/Chatto/Info.plist index 90db36aa4..9ae03a0c1 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.1.0 + 3.2.0 CFBundleSignature ???? CFBundleVersion diff --git a/ChattoApp/Pods/Target Support Files/ChattoAdditions/Info.plist b/ChattoApp/Pods/Target Support Files/ChattoAdditions/Info.plist index 90db36aa4..9ae03a0c1 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.1.0 + 3.2.0 CFBundleSignature ???? CFBundleVersion 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 aed060f04..4602c68ab 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 @@ -21,9 +21,6 @@ case "${TARGETED_DEVICE_FAMILY}" in 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.debug.xcconfig b/ChattoApp/Pods/Target Support Files/Pods-ChattoApp/Pods-ChattoApp.debug.xcconfig index 43b9bd5a2..971ee3924 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 @@ -7,5 +7,4 @@ 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 43b9bd5a2..971ee3924 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 @@ -7,5 +7,4 @@ 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/README.md b/README.md index 04ecfd011..ee84f4872 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ Check the [wiki!](https://github.com/badoo/Chatto/wiki) 2. Include the following in your `Podfile`: ``` # Swift 3 - pod 'Chatto', '= 3.1.0' - pod 'ChattoAdditions', '= 3.1.0' # if you want to use the cells or the input component + pod 'Chatto', '= 3.2.0' + pod 'ChattoAdditions', '= 3.2.0' # if you want to use the cells or the input component ``` ``` # Swift 2.x