From 1b1ec920f1e168707b1a6af80d297d8f0d77bbd1 Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Thu, 20 Jun 2019 22:52:43 +0300 Subject: [PATCH 1/2] Fixed build with module headers --- SQLite.swift.podspec | 28 +++++++++++++++++++++------- Sources/SQLite/SQLite.h | 2 +- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec index 524e721c..cae73653 100644 --- a/SQLite.swift.podspec +++ b/SQLite.swift.podspec @@ -15,14 +15,19 @@ Pod::Spec.new do |s| s.social_media_url = 'https://twitter.com/stephencelis' s.module_name = 'SQLite' - s.ios.deployment_target = "8.0" - s.tvos.deployment_target = "9.1" - s.osx.deployment_target = "10.10" - s.watchos.deployment_target = "2.2" s.default_subspec = 'standard' - s.pod_target_xcconfig = { - 'SWIFT_VERSION' => '5', - } + s.swift_versions = ['4.2', '5'] + + + ios_deployment_target = '8.0' + tvos_deployment_target = '9.1' + osx_deployment_target = '10.10' + watchos_deployment_target = '2.2' + + s.ios.deployment_target = ios_deployment_target + s.tvos.deployment_target = tvos_deployment_target + s.osx.deployment_target = osx_deployment_target + s.watchos.deployment_target = watchos_deployment_target s.subspec 'standard' do |ss| ss.source_files = 'Sources/{SQLite,SQLiteObjc}/**/*.{c,h,m,swift}' @@ -33,6 +38,9 @@ Pod::Spec.new do |s| ss.test_spec 'tests' do |test_spec| test_spec.resources = 'Tests/SQLiteTests/fixtures/*' test_spec.source_files = 'Tests/SQLiteTests/*.swift' + test_spec.ios.deployment_target = ios_deployment_target + test_spec.tvos.deployment_target = tvos_deployment_target + test_spec.osx.deployment_target = osx_deployment_target end end @@ -49,6 +57,9 @@ Pod::Spec.new do |s| ss.test_spec 'tests' do |test_spec| test_spec.resources = 'Tests/SQLiteTests/fixtures/*' test_spec.source_files = 'Tests/SQLiteTests/*.swift' + test_spec.ios.deployment_target = ios_deployment_target + test_spec.tvos.deployment_target = tvos_deployment_target + test_spec.osx.deployment_target = osx_deployment_target end end @@ -64,6 +75,9 @@ Pod::Spec.new do |s| ss.test_spec 'tests' do |test_spec| test_spec.resources = 'Tests/SQLiteTests/fixtures/*' test_spec.source_files = 'Tests/SQLiteTests/*.swift' + test_spec.ios.deployment_target = ios_deployment_target + test_spec.tvos.deployment_target = tvos_deployment_target + test_spec.osx.deployment_target = osx_deployment_target end end end diff --git a/Sources/SQLite/SQLite.h b/Sources/SQLite/SQLite.h index 69382ea0..fe1e3dfe 100644 --- a/Sources/SQLite/SQLite.h +++ b/Sources/SQLite/SQLite.h @@ -3,4 +3,4 @@ FOUNDATION_EXPORT double SQLiteVersionNumber; FOUNDATION_EXPORT const unsigned char SQLiteVersionString[]; -#import +#import "SQLiteObjc.h" From d0d802e3f99b78112cfb0b71894eeec021a7436c Mon Sep 17 00:00:00 2001 From: Yehor Popovych Date: Fri, 21 Jun 2019 13:18:14 +0300 Subject: [PATCH 2/2] version bump --- SQLite.swift.podspec | 2 +- Sources/SQLite/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SQLite.swift.podspec b/SQLite.swift.podspec index cae73653..2341cfc4 100644 --- a/SQLite.swift.podspec +++ b/SQLite.swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SQLite.swift" - s.version = "0.12.1" + s.version = "0.12.2" s.summary = "A type-safe, Swift-language layer over SQLite3 for iOS and macOS." s.description = <<-DESC diff --git a/Sources/SQLite/Info.plist b/Sources/SQLite/Info.plist index f7f7ce7f..2d956da2 100644 --- a/Sources/SQLite/Info.plist +++ b/Sources/SQLite/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.12.1 + 0.12.2 CFBundleSignature ???? CFBundleVersion