From 742d5b958ea6be1800e552a42362f6abf1529a6e Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Thu, 13 Sep 2018 15:55:43 -0700 Subject: [PATCH 1/9] Updated the Xcode project and podspec to Xcode 10 and Swift 4.2 --- SQift.podspec | 2 +- SQift.xcodeproj/project.pbxproj | 95 ++++++++++++++++++++++++++------- 2 files changed, 77 insertions(+), 20 deletions(-) diff --git a/SQift.podspec b/SQift.podspec index fe4571c..61806cd 100644 --- a/SQift.podspec +++ b/SQift.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.source = { :git => 'https://github.com/Nike-Inc/SQift.git', :tag => s.version } s.source_files = 'Source/**/*.swift' - s.swift_version = '4.1' + s.swift_version = '4.2' s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.11' diff --git a/SQift.xcodeproj/project.pbxproj b/SQift.xcodeproj/project.pbxproj index 618f7e6..36b36ac 100644 --- a/SQift.xcodeproj/project.pbxproj +++ b/SQift.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXAggregateTarget section */ @@ -829,7 +829,7 @@ }; }; buildConfigurationList = 4CA8C2181BF6A49400822606 /* Build configuration list for PBXProject "SQift" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( @@ -1183,7 +1183,11 @@ ); INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1206,7 +1210,11 @@ GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1"; INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1222,7 +1230,11 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; SDKROOT = macosx; @@ -1236,7 +1248,11 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; SDKROOT = macosx; @@ -1259,7 +1275,11 @@ ); INFOPLIST_FILE = "Source/Supporting Files/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1281,7 +1301,11 @@ GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1"; INFOPLIST_FILE = "Source/Supporting Files/Info-tvOS.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1296,7 +1320,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; SDKROOT = appletvos; @@ -1308,7 +1336,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; SDKROOT = appletvos; @@ -1331,7 +1363,11 @@ ); INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1353,7 +1389,11 @@ GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1"; INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1430,7 +1470,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1484,8 +1524,9 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -1511,7 +1552,11 @@ ); INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1531,7 +1576,11 @@ GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1"; INFOPLIST_FILE = "Source/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_BUNDLE_IDENTIFIER = com.nike.SQift; PRODUCT_NAME = SQift; @@ -1544,7 +1593,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; }; @@ -1555,7 +1608,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; }; From 5c7a3dde9e4ec83b31eeaa3b5921dc4d1a446f3b Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Thu, 13 Sep 2018 15:57:46 -0700 Subject: [PATCH 2/9] Added a .ruby-version file to ruby gems --- .ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..79a6144 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.4.4 From 54b96f7b85c5917a72223c06f85d23ba221f0551 Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Thu, 13 Sep 2018 15:57:58 -0700 Subject: [PATCH 3/9] Updated podspec to use double quotes throughout --- SQift.podspec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SQift.podspec b/SQift.podspec index 61806cd..4fe44c4 100644 --- a/SQift.podspec +++ b/SQift.podspec @@ -1,19 +1,19 @@ Pod::Spec.new do |s| - s.name = 'SQift' - s.version = '3.2.0' - s.license = 'MIT' - s.summary = 'A lightweight Swift wrapper for SQLite.' - s.homepage = 'https://github.com/Nike-Inc/SQift' - s.authors = { 'Dave Camp' => 'dave.camp@nike.com', 'Christian Noon' => 'christian.noon@nike.com' } + s.name = "SQift" + s.version = "3.2.0" + s.license = "MIT" + s.summary = "A lightweight Swift wrapper for SQLite." + s.homepage = "https://github.com/Nike-Inc/SQift" + s.authors = { "Dave Camp" => "dave.camp@nike.com", "Christian Noon" => "christian.noon@nike.com" } - s.source = { :git => 'https://github.com/Nike-Inc/SQift.git', :tag => s.version } - s.source_files = 'Source/**/*.swift' + s.source = { :git => "https://github.com/Nike-Inc/SQift.git", :tag => s.version } + s.source_files = "Source/**/*.swift" s.swift_version = '4.2' - s.ios.deployment_target = '9.0' - s.osx.deployment_target = '10.11' - s.tvos.deployment_target = '9.0' - s.watchos.deployment_target = '2.0' + s.ios.deployment_target = "9.0" + s.osx.deployment_target = "10.11" + s.tvos.deployment_target = "9.0" + s.watchos.deployment_target = "2.0" - s.libraries = 'sqlite3' + s.libraries = "sqlite3" end From cd03e9cda8a2491c52a89baa2cd5205a06dfb677 Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Fri, 14 Sep 2018 12:02:18 -0700 Subject: [PATCH 4/9] Disabled code signing on test targets --- SQift.xcodeproj/project.pbxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SQift.xcodeproj/project.pbxproj b/SQift.xcodeproj/project.pbxproj index 36b36ac..b411ceb 100644 --- a/SQift.xcodeproj/project.pbxproj +++ b/SQift.xcodeproj/project.pbxproj @@ -1319,6 +1319,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1327,6 +1329,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; }; name = Debug; @@ -1335,6 +1338,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1343,6 +1348,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; }; name = Release; @@ -1592,6 +1598,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1600,6 +1608,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -1607,6 +1616,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Tests/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1615,6 +1626,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.nike.SQift-Tests"; PRODUCT_NAME = "SQift Tests"; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; }; From dd912887c2341797891856d0a037561814fb842e Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Fri, 14 Sep 2018 12:02:34 -0700 Subject: [PATCH 5/9] Enabled code coverage on all non-ci schemes --- .../xcshareddata/WorkspaceSettings.xcsettings | 5 +++++ .../xcshareddata/xcschemes/SQift iOS CI.xcscheme | 9 +++++++++ .../xcshareddata/xcschemes/SQift iOS.xcscheme | 11 +++++++++++ .../xcshareddata/xcschemes/SQift macOS CI.xcscheme | 9 +++++++++ .../xcshareddata/xcschemes/SQift macOS.xcscheme | 11 +++++++++++ .../xcshareddata/xcschemes/SQift tvOS CI.xcscheme | 9 +++++++++ .../xcshareddata/xcschemes/SQift tvOS.xcscheme | 11 +++++++++++ 7 files changed, 65 insertions(+) create mode 100644 SQift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/SQift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/SQift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/SQift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS CI.xcscheme b/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS CI.xcscheme index 480cfd2..3acf886 100644 --- a/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS CI.xcscheme +++ b/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS CI.xcscheme @@ -41,6 +41,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "NO"> + + + + diff --git a/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS.xcscheme b/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS.xcscheme index 1a0625d..ff75911 100644 --- a/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS.xcscheme +++ b/SQift.xcodeproj/xcshareddata/xcschemes/SQift iOS.xcscheme @@ -40,7 +40,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + codeCoverageEnabled = "YES" + onlyGenerateCoverageForSpecifiedTargets = "YES" shouldUseLaunchSchemeArgsEnv = "NO"> + + + + diff --git a/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS CI.xcscheme b/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS CI.xcscheme index 883ed04..e41c657 100644 --- a/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS CI.xcscheme +++ b/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS CI.xcscheme @@ -41,6 +41,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "NO"> + + + + diff --git a/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS.xcscheme b/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS.xcscheme index 4b14e25..4f7b710 100644 --- a/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS.xcscheme +++ b/SQift.xcodeproj/xcshareddata/xcschemes/SQift macOS.xcscheme @@ -40,7 +40,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + codeCoverageEnabled = "YES" + onlyGenerateCoverageForSpecifiedTargets = "YES" shouldUseLaunchSchemeArgsEnv = "NO"> + + + + diff --git a/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS CI.xcscheme b/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS CI.xcscheme index 9a05cba..849f91c 100644 --- a/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS CI.xcscheme +++ b/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS CI.xcscheme @@ -41,6 +41,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "NO"> + + + + diff --git a/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS.xcscheme b/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS.xcscheme index 27f48c5..2386a3b 100644 --- a/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS.xcscheme +++ b/SQift.xcodeproj/xcshareddata/xcschemes/SQift tvOS.xcscheme @@ -40,7 +40,18 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + codeCoverageEnabled = "YES" + onlyGenerateCoverageForSpecifiedTargets = "YES" shouldUseLaunchSchemeArgsEnv = "NO"> + + + + From 2e5747058cff76fcb7724cc6c9d4fe43df6ba954 Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Fri, 14 Sep 2018 12:02:57 -0700 Subject: [PATCH 6/9] Added Gemfile and Gemfile.lock to the project along with Ruby 2.4.3 --- .ruby-version | 2 +- Gemfile | 4 +++ Gemfile.lock | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/.ruby-version b/.ruby-version index 79a6144..35cee72 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.4 +2.4.3 diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..34ffb91 --- /dev/null +++ b/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "cocoapods", "~> 1.6.0.beta.1" +gem "xcpretty" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..266e677 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,80 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.0) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + atomos (0.1.3) + claide (1.0.2) + cocoapods (1.6.0.beta.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.6.0.beta.1) + cocoapods-deintegrate (>= 1.0.2, < 2.0) + cocoapods-downloader (>= 1.2.1, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + nap (~> 1.0) + ruby-macho (~> 1.2) + xcodeproj (>= 1.6.0, < 2.0) + cocoapods-core (1.6.0.beta.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.2) + cocoapods-downloader (1.2.1) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.3.1) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.0.5) + escape (0.0.4) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.1.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + molinillo (0.6.6) + nanaimo (0.2.6) + nap (1.1.0) + netrc (0.11.0) + rouge (2.0.7) + ruby-macho (1.2.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + xcodeproj (1.6.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.6) + xcpretty (0.3.0) + rouge (~> 2.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + cocoapods (~> 1.6.0.beta.1) + xcpretty + +BUNDLED WITH + 1.16.4 From 2018e41754cfd39b41fc437c5da36efb44f684d4 Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Fri, 14 Sep 2018 12:03:12 -0700 Subject: [PATCH 7/9] Updated travis-ci yaml file to use bundler and Xcode 10 --- .travis.yml | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10f13d9..47139cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ -language: objective-c -osx_image: xcode9.3 +os: osx +osx_image: xcode10 branches: only: - master + env: global: - LC_CTYPE=en_US.UTF-8 @@ -12,37 +13,43 @@ env: - MACOS_FRAMEWORK_SCHEME="SQift macOS CI" - TVOS_FRAMEWORK_SCHEME="SQift tvOS CI" - WATCHOS_FRAMEWORK_SCHEME="SQift watchOS" - - IOS_SDK=iphonesimulator11.3 - - OSX_SDK=macosx10.13 - - TVOS_SDK=appletvsimulator11.3 - - WATCHOS_SDK=watchsimulator4.3 matrix: - - DESTINATION="OS=11.3,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" - - DESTINATION="OS=10.3.1,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" - - DESTINATION="OS=9.3,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" - - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$OSX_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" - - DESTINATION="OS=11.3,name=Apple TV" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" - - DESTINATION="OS=4.3,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=12.0,name=iPhone XS" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" + - DESTINATION="OS=11.3,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=10.3.1,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="OS=9.3,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO" + - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=12.0,name=Apple TV 4K" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=5.0,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" + +before_install: + - gem update bundler + script: - set -o pipefail + - rvm list + - which ruby + - bundle exec gem list + - bundle exec pod --version + - bundle exec xcpretty --version - xcodebuild -version - xcodebuild -showsdks # Build Framework in Debug and Run Tests if specified - if [ $RUN_TESTS == "YES" ]; then - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=YES ENABLE_TESTABILITY=YES test | xcpretty -c; + xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=YES ENABLE_TESTABILITY=YES test | bundle exec xcpretty -c; else - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c; + xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | bundle exec xcpretty -c; fi # Build Framework in Release and Run Tests if specified - if [ $RUN_TESTS == "YES" ]; then - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c; + xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | bundle exec xcpretty -c; else - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c; + xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | bundle exec xcpretty -c; fi # Run `pod lib lint` if specified - if [ $POD_LINT == "YES" ]; then - pod lib lint --private; + bundle exec pod lib lint; fi From 524f3b48645f4fdcc6a28191938e0e38b491cbf0 Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Fri, 14 Sep 2018 12:03:33 -0700 Subject: [PATCH 8/9] Updated the connection pool test to be more robust on CI --- Tests/Tests/Connection/ConnectionPoolTests.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/Tests/Connection/ConnectionPoolTests.swift b/Tests/Tests/Connection/ConnectionPoolTests.swift index ea69782..cdcb6ca 100644 --- a/Tests/Tests/Connection/ConnectionPoolTests.swift +++ b/Tests/Tests/Connection/ConnectionPoolTests.swift @@ -108,17 +108,19 @@ class ConnectionPoolTestCase: BaseTestCase { func testThatConnectionPoolCanExecuteReadOnlyClosure() throws { // Given + let connection = try Connection(storageLocation: storageLocation) + try TestTables.createAndPopulateAgentsTable(using: connection) let pool = ConnectionPool(storageLocation: storageLocation) var count: Int? // When try pool.execute { connection in - count = try connection.query("SELECT count(*) FROM sqlite_master where type = 'table'") + count = try connection.query("SELECT count(*) FROM agents") } // Then - XCTAssertEqual(count, 0) + XCTAssertGreaterThanOrEqual(count ?? -1, 0) } func testThatConnectionPoolFailsToExecuteWriteClosure() { From fa32d3a3d6bdbf60932b9df970c0e91cfa76f3ee Mon Sep 17 00:00:00 2001 From: Christian Noon Date: Fri, 14 Sep 2018 12:04:40 -0700 Subject: [PATCH 9/9] Added release notes to the CHANGELOG and bumped the version to 3.2.1 --- CHANGELOG.md | 19 ++++++++++++++++++- README.md | 4 ++-- SQift.podspec | 4 ++-- Source/Supporting Files/Info-tvOS.plist | 2 +- Source/Supporting Files/Info.plist | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2591ab0..40232a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. #### 3.x Releases -- `3.2.x` Releases - [3.2.0](#320) +- `3.2.x` Releases - [3.2.0](#320) | | [3.2.1](#321) - `3.1.x` Releases - [3.1.0](#310) - `3.0.x` Releases - [3.0.0](#300) | [3.0.1](#301) @@ -33,6 +33,23 @@ All notable changes to this project will be documented in this file. --- +## [3.2.1](https://github.com/Nike-Inc/SQift/releases/tag/3.2.1) + +Released on 2018-05-14. All issues associated with this milestone can be found using this +[filter](https://github.com/Nike-Inc/SQift/milestone/6?closed=1). + +#### Updated + +- The Xcode project to use Xcode 9.3 compatibility mode. + - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request + [#9](https://github.com/Nike-Inc/SQift/pull/9). +- The Xcode project to support Xcode 10 and Swift 4.2. + - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request + [#9](https://github.com/Nike-Inc/SQift/pull/9). +- The Travis-CI YAML file to use `bundler` and Xcode 10. + - Updated by [Christian Noon](https://github.com/cnoon) in Pull Request + [#9](https://github.com/Nike-Inc/SQift/pull/9). + ## [3.2.0](https://github.com/Nike-Inc/SQift/releases/tag/3.2.0) Released on 2018-05-02. All issues associated with this milestone can be found using this diff --git a/README.md b/README.md index e4d9ef5..72d047a 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ SQift is a lightweight Swift wrapper for SQLite. ## Requirements - iOS 9.0+, macOS 10.11+, tvOS 9.0+, watchOS 2.0+ -- Xcode 9.0+ -- Swift 4.0+ +- Xcode 9.3+ +- Swift 4.1+ ## Communication diff --git a/SQift.podspec b/SQift.podspec index 4fe44c4..6d58531 100644 --- a/SQift.podspec +++ b/SQift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SQift" - s.version = "3.2.0" + s.version = "3.2.1" s.license = "MIT" s.summary = "A lightweight Swift wrapper for SQLite." s.homepage = "https://github.com/Nike-Inc/SQift" @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/Nike-Inc/SQift.git", :tag => s.version } s.source_files = "Source/**/*.swift" - s.swift_version = '4.2' + s.swift_version = "4.2" s.ios.deployment_target = "9.0" s.osx.deployment_target = "10.11" diff --git a/Source/Supporting Files/Info-tvOS.plist b/Source/Supporting Files/Info-tvOS.plist index 07bfcd5..e626112 100644 --- a/Source/Supporting Files/Info-tvOS.plist +++ b/Source/Supporting Files/Info-tvOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.2.0 + 3.2.1 CFBundleSignature ???? CFBundleVersion diff --git a/Source/Supporting Files/Info.plist b/Source/Supporting Files/Info.plist index 340121d..7add7c8 100644 --- a/Source/Supporting Files/Info.plist +++ b/Source/Supporting Files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.2.0 + 3.2.1 CFBundleSignature ???? CFBundleVersion