From 07032ed4e2c6dbe951bbf5d0a45215d29070ae70 Mon Sep 17 00:00:00 2001 From: Charley <2555085@qq.com> Date: Wed, 12 Jun 2019 21:19:45 +0800 Subject: [PATCH 1/2] update swift5 --- .gitmodules | 3 -- Vendor/SQLite.swift | 2 +- YTKKeyValueStore.xcodeproj/project.pbxproj | 31 +++++++++++++++---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++ .../xcschemes/YTKKeyValueStore.xcscheme | 2 +- YTKKeyValueStore/Info.plist | 2 +- YTKKeyValueStore/YTKConfig.swift | 12 +++---- YTKKeyValueStore/YTKKeyValueStore.swift | 12 +++---- YTKKeyValueStore/YTKSetter.swift | 2 +- YTKKeyValueStore/YTKTable.swift | 20 ++++++------ YTKKeyValueStore_Swift.podspec | 6 ++-- 11 files changed, 62 insertions(+), 38 deletions(-) delete mode 100644 .gitmodules create mode 100644 YTKKeyValueStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e1692f3..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Vendor/SQLite.swift"] - path = Vendor/SQLite.swift - url = https://github.com/stephencelis/SQLite.swift.git diff --git a/Vendor/SQLite.swift b/Vendor/SQLite.swift index 5e771a1..691fc89 160000 --- a/Vendor/SQLite.swift +++ b/Vendor/SQLite.swift @@ -1 +1 @@ -Subproject commit 5e771a1af67f52b5154cc5e9ee3f0f5f4a3e07a5 +Subproject commit 691fc89e75873d417d700920e79a63cf210d1d71 diff --git a/YTKKeyValueStore.xcodeproj/project.pbxproj b/YTKKeyValueStore.xcodeproj/project.pbxproj index 674d694..a83ad58 100644 --- a/YTKKeyValueStore.xcodeproj/project.pbxproj +++ b/YTKKeyValueStore.xcodeproj/project.pbxproj @@ -262,7 +262,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = sgxiang; TargetAttributes = { 1A5891A41A8B4F6200155614 = { @@ -277,10 +277,11 @@ }; buildConfigurationList = 1A58919F1A8B4F6200155614 /* Build configuration list for PBXProject "YTKKeyValueStore" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 1A58919B1A8B4F6200155614; productRefGroup = 1A5891A61A8B4F6200155614 /* Products */; @@ -410,14 +411,22 @@ 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_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; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -461,14 +470,22 @@ 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_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; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -515,7 +532,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -536,7 +553,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.sgxiang.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -552,10 +569,11 @@ "$(inherited)", ); INFOPLIST_FILE = YTKKeyValueStoreTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.sgxiang.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -567,10 +585,11 @@ "$(inherited)", ); INFOPLIST_FILE = YTKKeyValueStoreTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.sgxiang.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/YTKKeyValueStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/YTKKeyValueStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/YTKKeyValueStore.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/YTKKeyValueStore.xcodeproj/xcshareddata/xcschemes/YTKKeyValueStore.xcscheme b/YTKKeyValueStore.xcodeproj/xcshareddata/xcschemes/YTKKeyValueStore.xcscheme index 8283e3d..d070698 100644 --- a/YTKKeyValueStore.xcodeproj/xcshareddata/xcschemes/YTKKeyValueStore.xcscheme +++ b/YTKKeyValueStore.xcodeproj/xcshareddata/xcschemes/YTKKeyValueStore.xcscheme @@ -1,6 +1,6 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.4.2 + 0.5.0 CFBundleSignature ???? CFBundleVersion diff --git a/YTKKeyValueStore/YTKConfig.swift b/YTKKeyValueStore/YTKConfig.swift index 3ac512e..85150fa 100644 --- a/YTKKeyValueStore/YTKConfig.swift +++ b/YTKKeyValueStore/YTKConfig.swift @@ -9,12 +9,12 @@ import UIKit import SQLite -internal let YTKDEBUG = true +public let YTKDEBUG = true -internal let PATH_OF_DOCUMENT : String = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0] +public let PATH_OF_DOCUMENT : String = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0] -internal let DEFAULT_DB_NAME = "database_swift.sqlite3" +public let DEFAULT_DB_NAME = "database_swift.sqlite3" -internal let ID = Expression("id") -internal let JSON = Expression("json") -internal let CREATEDTIME = Expression("createdTime") +public let ID = Expression("id") +public let JSON = Expression("json") +public let CREATEDTIME = Expression("createdTime") diff --git a/YTKKeyValueStore/YTKKeyValueStore.swift b/YTKKeyValueStore/YTKKeyValueStore.swift index 74da9de..ae43692 100755 --- a/YTKKeyValueStore/YTKKeyValueStore.swift +++ b/YTKKeyValueStore/YTKKeyValueStore.swift @@ -13,13 +13,13 @@ public class YTKKeyValueStore{ private var db : Connection? - private init(dbPath : String!) { + private init(dbPath : String) { db = try! Connection(dbPath) } - convenience public init(_ dbName : String! = DEFAULT_DB_NAME , path : String! = PATH_OF_DOCUMENT) throws{ + convenience public init(_ dbName : String = DEFAULT_DB_NAME , path : String = PATH_OF_DOCUMENT) throws{ - self.init(dbPath:"\(path!)/\(dbName!)") + self.init(dbPath:"\(path)/\(dbName)") guard db != nil else{ throw YTKError.dbConnectionError @@ -27,11 +27,11 @@ public class YTKKeyValueStore{ } - public subscript (tableName : String!) -> YTKTable{ + public subscript (tableName : String) -> YTKTable{ return YTKTable(db: self.db, tableName) } - public func createTable(tableName:String!) throws{ + public func createTable(tableName:String) throws{ guard YTKTable.checkTableName(tableName) else{ throw YTKError.nameFormatError @@ -50,7 +50,7 @@ public class YTKKeyValueStore{ } - public func dropTable(tableName:String!) throws{ + public func dropTable(tableName:String) throws{ guard YTKTable.checkTableName(tableName) else{ throw YTKError.nameFormatError diff --git a/YTKKeyValueStore/YTKSetter.swift b/YTKKeyValueStore/YTKSetter.swift index 916c40e..42f55bb 100644 --- a/YTKKeyValueStore/YTKSetter.swift +++ b/YTKKeyValueStore/YTKSetter.swift @@ -55,6 +55,6 @@ precedencegroup MultiplicationPrecedence { higherThan: AdditionPrecedence } -public func <- (objectId: String!, object: Any!) -> YTKSetter{ +public func <- (objectId: String!, object: Any) -> YTKSetter{ return YTKSetter(objectId , object) } diff --git a/YTKKeyValueStore/YTKTable.swift b/YTKKeyValueStore/YTKTable.swift index 201deaa..b28590b 100755 --- a/YTKKeyValueStore/YTKTable.swift +++ b/YTKKeyValueStore/YTKTable.swift @@ -30,7 +30,7 @@ public struct YTKTable{ internal let db : Connection? internal let tableHandle : Table? - internal init(db : Connection?, _ tableName : String!){ + internal init(db : Connection?, _ tableName : String){ if YTKTable.checkTableName(tableName){ self.db = db self.name = tableName @@ -42,7 +42,7 @@ public struct YTKTable{ } } - internal static func checkTableName(_ tableName : String!)->Bool{ + internal static func checkTableName(_ tableName : String)->Bool{ if tableName.contains(" "){ print("table name : \(tableName) format error") return false @@ -74,7 +74,7 @@ public struct YTKTable{ } - public func deletePreLike(_ objectId : String!) throws -> Int{ + public func deletePreLike(_ objectId : String) throws -> Int{ do{ let changes = try db?.run(tableHandle!.filter(ID.like("\(objectId)%")).delete()) ?? 0 @@ -89,7 +89,7 @@ public struct YTKTable{ case string,number,object } - fileprivate static func valueWithType(_ object : AnyObject!)->YTKKeyValueType{ + fileprivate static func valueWithType(_ object : AnyObject)->YTKKeyValueType{ if object is String{ return .string }else if (object as? NSNumber) != nil{ @@ -111,14 +111,14 @@ public struct YTKTable{ if filter.makeIterator().next() == nil{ do{ try db?.run( tableHandle!.insert(ID <- set.objectId,JSON <- jsonString,CREATEDTIME <- Date()) ) - print("[insert] id : \(set.objectId) jsonString : \(set.jsonString!)") + print("[insert] id : \(set.objectId!) jsonString : \(set.jsonString!)") }catch let error{ throw error } }else{ do{ try db?.run(query.update(JSON <- jsonString,CREATEDTIME <- Date())) - print("[update] id : \(set.objectId) jsonString : \(set.jsonString!)") + print("[update] id : \(set.objectId!) jsonString : \(set.jsonString!)") }catch let error{ throw error } @@ -130,7 +130,7 @@ public struct YTKTable{ } - public func get( _ objectId : String! ) throws -> YTKObject?{ + public func get( _ objectId : String ) throws -> YTKObject?{ do{ if let item = try self.getItem(objectId){ return item.itemObject @@ -141,14 +141,14 @@ public struct YTKTable{ return nil } - public func getItem(_ objectId :String!) throws ->YTKItem?{ + public func getItem(_ objectId :String) throws ->YTKItem?{ do{ if let filter = try db?.prepare( tableHandle!.filter(ID == objectId).limit(1) ){ for v in filter{ var item = YTKItem() item.itemId = objectId item.itemObject = YTKObject(value: v[JSON] as AnyObject ) - item.createdTime = v.get(CREATEDTIME) + item.createdTime = try? v.get(CREATEDTIME) return item } } @@ -167,7 +167,7 @@ public struct YTKTable{ var item = YTKItem() item.itemId = vs[ID] item.itemObject = YTKObject(value:vs[JSON] as AnyObject) - item.createdTime = vs.get(CREATEDTIME) + item.createdTime = try? vs.get(CREATEDTIME) result.append(item) } } diff --git a/YTKKeyValueStore_Swift.podspec b/YTKKeyValueStore_Swift.podspec index e8f98f8..438a43e 100644 --- a/YTKKeyValueStore_Swift.podspec +++ b/YTKKeyValueStore_Swift.podspec @@ -1,14 +1,14 @@ Pod::Spec.new do |s| s.name = "YTKKeyValueStore_Swift" - s.version = "0.4.2" + s.version = "0.5.0" s.summary = "A simple Key-Value storage tool, using Sqlite as backend." s.homepage = "https://github.com/sgxiang/YTKKeyValueStore_Swift" s.license = "MIT" s.author = { "sgxiang" => "690228918@qq.com" } s.platform = :ios, '9.0' - s.source = { :git => "https://github.com/sgxiang/YTKKeyValueStore_Swift.git", :tag => "0.4.2" } + s.source = { :git => "https://github.com/sgxiang/YTKKeyValueStore_Swift.git", :tag => "0.5.0" } s.source_files = "YTKKeyValueStore/*.swift" s.requires_arc = true s.module_name = 'YTKKeyValueStore' - s.dependency "SQLite.swift", "~> 0.11.3" + s.dependency "SQLite.swift", "~> 0.12.0" end \ No newline at end of file From 10a982497b947956d4f712fa6176658bb773035f Mon Sep 17 00:00:00 2001 From: Charley <2555085@qq.com> Date: Wed, 12 Jun 2019 21:29:11 +0800 Subject: [PATCH 2/2] update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 94fe95e..6c315fa 100755 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ objc version ：https://github.com/yuantiku/YTKKeyValueStore ## Requirements - iOS 9.0+ -- Xcode 8.0 -- Swift 3.0 +- Xcode 10.0 +- Swift 5.0 ## Usage @@ -72,7 +72,7 @@ arrayValue : return Array? Update Cartfile to include the following: ``` -github "sgxiang/YTKKeyValueStore_Swift" ~> 0.4.2 +github "sgxiang/YTKKeyValueStore_Swift" ~> 0.5.0 ``` Run `carthage update` and [add the appropriate framework][Carthage Usage]. @@ -86,7 +86,7 @@ Update Podfile to include the following: ```ruby use_frameworks! -pod 'YTKKeyValueStore_Swift', '~> 0.4.2' +pod 'YTKKeyValueStore_Swift', '~> 0.5.0' ``` Run `pod install`