diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 124e5672..5332cfac 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - TLPhotoPicker (1.8.2) + - TLPhotoPicker (1.8.3) DEPENDENCIES: - TLPhotoPicker (from `../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - TLPhotoPicker: 27e7e3617fad7aa746bb0ce8a306ec43d52d5d34 + TLPhotoPicker: 1399b3b1cb2b8b19fc2a7108b1398e25ad465845 PODFILE CHECKSUM: 79c2955b8f0f82b92e74722dc635d1390f908d1a diff --git a/Example/Pods/Local Podspecs/TLPhotoPicker.podspec.json b/Example/Pods/Local Podspecs/TLPhotoPicker.podspec.json index 18af50d8..98b2f47c 100644 --- a/Example/Pods/Local Podspecs/TLPhotoPicker.podspec.json +++ b/Example/Pods/Local Podspecs/TLPhotoPicker.podspec.json @@ -1,6 +1,6 @@ { "name": "TLPhotoPicker", - "version": "1.8.2", + "version": "1.8.3", "summary": "multiple phassets picker for iOS lib. like facebook", "description": "TODO: Add long description of the pod here.", "homepage": "https://github.com/tilltue/TLPhotoPicker", @@ -13,14 +13,14 @@ }, "source": { "git": "https://github.com/tilltue/TLPhotoPicker.git", - "tag": "1.8.2" + "tag": "1.8.3" }, "platforms": { "ios": "9.1" }, - "swift_version": "4.2", + "swift_version": "5.0", "pod_target_xcconfig": { - "SWIFT_VERSION": "4.2" + "SWIFT_VERSION": "5.0" }, "source_files": "TLPhotoPicker/Classes/**/*", "resource_bundles": { diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 124e5672..5332cfac 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - TLPhotoPicker (1.8.2) + - TLPhotoPicker (1.8.3) DEPENDENCIES: - TLPhotoPicker (from `../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - TLPhotoPicker: 27e7e3617fad7aa746bb0ce8a306ec43d52d5d34 + TLPhotoPicker: 1399b3b1cb2b8b19fc2a7108b1398e25ad465845 PODFILE CHECKSUM: 79c2955b8f0f82b92e74722dc635d1390f908d1a diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 1e6c9c85..2ae705bf 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -57,24 +57,24 @@ 1EF5EE250763E3B536117B2441A0DE1C /* Pods-TLPhotoPicker_Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-TLPhotoPicker_Example-resources.sh"; sourceTree = ""; }; 22D4FB4FA12F5A68665F935581CFAB00 /* TLAssetsCollection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TLAssetsCollection.swift; path = TLPhotoPicker/Classes/TLAssetsCollection.swift; sourceTree = ""; }; 29E4750E4C1A8B46EF55B92AB83F82D9 /* Pods-TLPhotoPicker_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-TLPhotoPicker_Example-acknowledgements.plist"; sourceTree = ""; }; - 2B21B62557A3AC21C75148CEE4AA7C02 /* TLPhotoPicker.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = TLPhotoPicker.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 2B21B62557A3AC21C75148CEE4AA7C02 /* TLPhotoPicker.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = TLPhotoPicker.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 390358D4CE2312B940C09A896EBEA7A4 /* TLPhotoCollectionViewCell.xib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.xib; name = TLPhotoCollectionViewCell.xib; path = TLPhotoPicker/Classes/TLPhotoCollectionViewCell.xib; sourceTree = ""; }; 3AAA5C3F7C13961ED0FA08D01269F7B6 /* TLPhotoPicker-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TLPhotoPicker-prefix.pch"; sourceTree = ""; }; 4D549D26905483DBDCB34D207C038454 /* Pods-TLPhotoPicker_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-TLPhotoPicker_Example.release.xcconfig"; sourceTree = ""; }; 5A16F4CFC63FAC439D7A04994F579A03 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 67A229A43EA474137B02D3246FAEA283 /* Pods_TLPhotoPicker_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_TLPhotoPicker_Example.framework; path = "Pods-TLPhotoPicker_Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 67A229A43EA474137B02D3246FAEA283 /* Pods_TLPhotoPicker_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TLPhotoPicker_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6C0A1A588AF933C36C60CB59F124C442 /* Pods-TLPhotoPicker_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-TLPhotoPicker_Example.debug.xcconfig"; sourceTree = ""; }; - 6D4894D74CA8A74BE99D47B73E37BFAF /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 6D4894D74CA8A74BE99D47B73E37BFAF /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 6F36E527F5316AF6DA9099FE60BD9A36 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 725267EAFB2C1B9A0D63CF945120832E /* TLPhotoPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = TLPhotoPicker.framework; path = TLPhotoPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 725267EAFB2C1B9A0D63CF945120832E /* TLPhotoPicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TLPhotoPicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 81FC751C41D853CAC7B6D9974C67822D /* TLPhotoPicker.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = TLPhotoPicker.modulemap; sourceTree = ""; }; 823317A4EDBF69B03682277F46791BE0 /* TLPhotoLibrary.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TLPhotoLibrary.swift; path = TLPhotoPicker/Classes/TLPhotoLibrary.swift; sourceTree = ""; }; 8910D6D206F4885D8A9E0B931F518BDD /* TLPhotoPicker.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = TLPhotoPicker.xcconfig; sourceTree = ""; }; 8D084DD32EFF57218F8E251E9A5BD91D /* Pods-TLPhotoPicker_Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-TLPhotoPicker_Example.modulemap"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 964DA1D4BA09051F1232210E8CA86587 /* TLAlbumPopView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TLAlbumPopView.swift; path = TLPhotoPicker/Classes/TLAlbumPopView.swift; sourceTree = ""; }; 97BE0A20BBA3E253F829599C2C78B2D6 /* Pods-TLPhotoPicker_Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-TLPhotoPicker_Example-acknowledgements.markdown"; sourceTree = ""; }; - 97D6A7784BD0A7B85273B4F018814511 /* TLPhotoPicker.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = TLPhotoPicker.bundle; path = "TLPhotoPicker-TLPhotoPicker.bundle"; sourceTree = BUILT_PRODUCTS_DIR; }; + 97D6A7784BD0A7B85273B4F018814511 /* TLPhotoPicker.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TLPhotoPicker.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; A4351F0C1CAA7F242616792C3BAACCC4 /* Pods-TLPhotoPicker_Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-TLPhotoPicker_Example-frameworks.sh"; sourceTree = ""; }; AE61FCEDF25B2A46ECB42AD67045E112 /* TLPhotopickerDataSourcesProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TLPhotopickerDataSourcesProtocol.swift; path = TLPhotoPicker/Classes/TLPhotopickerDataSourcesProtocol.swift; sourceTree = ""; }; AF0BA59ACFDE5B9FEAEE4D59DFF70532 /* TLAssetCollection+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "TLAssetCollection+Extension.swift"; path = "TLPhotoPicker/Classes/TLAssetCollection+Extension.swift"; sourceTree = ""; }; @@ -87,7 +87,7 @@ F41A35D95BF74C921A8A22FE80C1077C /* TLPhotoPickerController.bundle */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "wrapper.plug-in"; name = TLPhotoPickerController.bundle; path = TLPhotoPicker/TLPhotoPickerController.bundle; sourceTree = ""; }; FAF638D8191CA448BDC143CC2616612E /* TLCollectionTableViewCell.xib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.xib; name = TLCollectionTableViewCell.xib; path = TLPhotoPicker/Classes/TLCollectionTableViewCell.xib; sourceTree = ""; }; FF392924D083DC1E50E2B950618FA36B /* TLPhotoPicker-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "TLPhotoPicker-dummy.m"; sourceTree = ""; }; - FF42D2AB13BC16A9E8D6F38F0FAC8A5E /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + FF42D2AB13BC16A9E8D6F38F0FAC8A5E /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -327,14 +327,15 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1020; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 7DB346D0F39D3F0E887471402A8071AB; productRefGroup = 9013457BA4848B58D4495341E365B6DD /* Products */; @@ -424,6 +425,38 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 1507CC0228C078219F85963591718801 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8910D6D206F4885D8A9E0B931F518BDD /* TLPhotoPicker.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/TLPhotoPicker/TLPhotoPicker-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/TLPhotoPicker/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 9.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/TLPhotoPicker/TLPhotoPicker.modulemap"; + PRODUCT_MODULE_NAME = TLPhotoPicker; + PRODUCT_NAME = TLPhotoPicker; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; 3E62D5EE52DAD3974A648C03FCD7CFE0 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8910D6D206F4885D8A9E0B931F518BDD /* TLPhotoPicker.xcconfig */; @@ -456,7 +489,7 @@ }; name = Release; }; - 4A2261D42342D659D9FA89446DB46915 /* Release */ = { + 53E977C4399D3629A4BE6895B1525D1E /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8910D6D206F4885D8A9E0B931F518BDD /* TLPhotoPicker.xcconfig */; buildSettings = { @@ -481,7 +514,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -559,42 +592,11 @@ }; name = Release; }; - 97025C12A5FB6F9FBB8E979BCFA1A968 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 8910D6D206F4885D8A9E0B931F518BDD /* TLPhotoPicker.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/TLPhotoPicker/TLPhotoPicker-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/TLPhotoPicker/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/TLPhotoPicker/TLPhotoPicker.modulemap"; - PRODUCT_MODULE_NAME = TLPhotoPicker; - PRODUCT_NAME = TLPhotoPicker; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; 9B9D45A1FA553066CCF4A9AA06C14141 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -645,6 +647,7 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; SYMROOT = "${SRCROOT}/../build"; }; name = Release; @@ -653,6 +656,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -727,8 +731,8 @@ 644D4B45176B169CC41CDB181D85FBED /* Build configuration list for PBXNativeTarget "TLPhotoPicker" */ = { isa = XCConfigurationList; buildConfigurations = ( - 97025C12A5FB6F9FBB8E979BCFA1A968 /* Debug */, - 4A2261D42342D659D9FA89446DB46915 /* Release */, + 1507CC0228C078219F85963591718801 /* Debug */, + 53E977C4399D3629A4BE6895B1525D1E /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Target Support Files/TLPhotoPicker/Info.plist b/Example/Pods/Target Support Files/TLPhotoPicker/Info.plist index 7cfa2845..4cd35d70 100644 --- a/Example/Pods/Target Support Files/TLPhotoPicker/Info.plist +++ b/Example/Pods/Target Support Files/TLPhotoPicker/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.8.2 + 1.8.3 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/TLPhotoPicker/ResourceBundle-TLPhotoPicker-Info.plist b/Example/Pods/Target Support Files/TLPhotoPicker/ResourceBundle-TLPhotoPicker-Info.plist index ff8ede7e..d1eceb34 100644 --- a/Example/Pods/Target Support Files/TLPhotoPicker/ResourceBundle-TLPhotoPicker-Info.plist +++ b/Example/Pods/Target Support Files/TLPhotoPicker/ResourceBundle-TLPhotoPicker-Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.8.2 + 1.8.3 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/TLPhotoPicker/TLPhotoPicker.xcconfig b/Example/Pods/Target Support Files/TLPhotoPicker/TLPhotoPicker.xcconfig index 8432689f..be43053b 100644 --- a/Example/Pods/Target Support Files/TLPhotoPicker/TLPhotoPicker.xcconfig +++ b/Example/Pods/Target Support Files/TLPhotoPicker/TLPhotoPicker.xcconfig @@ -7,4 +7,4 @@ PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} SKIP_INSTALL = YES -SWIFT_VERSION = 4.2 +SWIFT_VERSION = 5.0 diff --git a/Example/TLPhotoPicker.xcodeproj/project.pbxproj b/Example/TLPhotoPicker.xcodeproj/project.pbxproj index 15f1136d..c5263dad 100644 --- a/Example/TLPhotoPicker.xcodeproj/project.pbxproj +++ b/Example/TLPhotoPicker.xcodeproj/project.pbxproj @@ -230,7 +230,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0910; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { @@ -242,7 +242,7 @@ }; buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "TLPhotoPicker" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -362,6 +362,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -370,12 +371,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -416,6 +419,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -424,12 +428,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -470,7 +476,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -485,7 +491,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Example/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker-Example.xcscheme b/Example/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker-Example.xcscheme index 13106e6c..a5e408ed 100644 --- a/Example/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker-Example.xcscheme +++ b/Example/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker-Example.xcscheme @@ -1,6 +1,6 @@ use 'version 1.2.7' , Swift 4.0 -> use 'version 1.7.2' ) +- Swift 5.0 ( Swift 4.2 -> use 'version 1.8.3' ) - iOS 9.1 (for use live photos) ### Cocoapods diff --git a/TLPhotoPicker.podspec b/TLPhotoPicker.podspec index 5d6d7b4d..0dc9cb2d 100644 --- a/TLPhotoPicker.podspec +++ b/TLPhotoPicker.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'TLPhotoPicker' - s.version = '1.8.3' + s.version = '1.8.4' s.summary = 'multiple phassets picker for iOS lib. like facebook' # This description is used to generate tags and improve search results. @@ -29,8 +29,8 @@ TODO: Add long description of the pod here. # s.social_media_url = 'https://twitter.com/' s.ios.deployment_target = '9.1' - s.swift_version = '4.2' - s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' } + s.swift_version = '5.0' + s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' } s.source_files = 'TLPhotoPicker/Classes/**/*' diff --git a/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift b/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift index 16f6b8bc..6b702045 100644 --- a/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift +++ b/TLPhotoPicker/Classes/TLPhotosPickerViewController.swift @@ -216,6 +216,8 @@ open class TLPhotosPickerViewController: UIViewController { case .restricted: fallthrough case .denied: handleDeniedAlbumsAuthorization() + @unknown default: + break } } @@ -276,7 +278,7 @@ extension TLPhotosPickerViewController { } private func initItemSize() { - guard var layout = self.collectionView.collectionViewLayout as? UICollectionViewFlowLayout else { + guard let layout = self.collectionView.collectionViewLayout as? UICollectionViewFlowLayout else { return } let count = CGFloat(self.configure.numberOfColumn) @@ -372,7 +374,7 @@ extension TLPhotosPickerViewController { } private func getfocusedIndex() -> Int { - guard let focused = self.focusedCollection, let result = self.collections.index(where: { $0 == focused }) else { return 0 } + guard let focused = self.focusedCollection, let result = self.collections.firstIndex(where: { $0 == focused }) else { return 0 } return result } @@ -506,6 +508,8 @@ extension TLPhotosPickerViewController: UIImagePickerControllerDelegate, UINavig }) case .restricted, .denied: self.handleDeniedCameraAuthorization() + @unknown default: + break } } @@ -744,7 +748,7 @@ extension TLPhotosPickerViewController: PHPhotoLibraryChangeObserver { // MARK: - UICollectionView delegate & datasource extension TLPhotosPickerViewController: UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDataSourcePrefetching { private func getSelectedAssets(_ asset: TLPHAsset) -> TLPHAsset? { - if let index = self.selectedAssets.index(where: { $0.phAsset == asset.phAsset }) { + if let index = self.selectedAssets.firstIndex(where: { $0.phAsset == asset.phAsset }) { return self.selectedAssets[index] } return nil @@ -784,7 +788,7 @@ extension TLPhotosPickerViewController: UICollectionViewDelegate,UICollectionVie } guard var asset = collection.getTLAsset(at: indexPath), let phAsset = asset.phAsset else { return } cell.popScaleAnim() - if let index = self.selectedAssets.index(where: { $0.phAsset == asset.phAsset }) { + if let index = self.selectedAssets.firstIndex(where: { $0.phAsset == asset.phAsset }) { //deselect self.logDelegate?.deselectedPhoto(picker: self, at: indexPath.row) self.selectedAssets.remove(at: index) diff --git a/TLPhotoPicker/TLPhotoPicker.xcodeproj/project.pbxproj b/TLPhotoPicker/TLPhotoPicker.xcodeproj/project.pbxproj index b5159a72..761d6dbd 100644 --- a/TLPhotoPicker/TLPhotoPicker.xcodeproj/project.pbxproj +++ b/TLPhotoPicker/TLPhotoPicker.xcodeproj/project.pbxproj @@ -129,7 +129,7 @@ 18465D92206E8A8B0015A715 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = wade.hawk; TargetAttributes = { 18465D9A206E8A8B0015A715 = { @@ -145,6 +145,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 18465D91206E8A8B0015A715; productRefGroup = 18465D9C206E8A8B0015A715 /* Products */; @@ -204,6 +205,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -211,6 +213,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -264,6 +267,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -271,6 +275,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -321,7 +326,7 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s"; }; @@ -344,7 +349,7 @@ PRODUCT_BUNDLE_IDENTIFIER = tilltue.TLPhotoPicker; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s"; }; diff --git a/TLPhotoPicker/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker.xcscheme b/TLPhotoPicker/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker.xcscheme index ddc91e7d..c128d148 100644 --- a/TLPhotoPicker/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker.xcscheme +++ b/TLPhotoPicker/TLPhotoPicker.xcodeproj/xcshareddata/xcschemes/TLPhotoPicker.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO"