From eb915a2d31405a1859d3a198f9296602b9e7afe2 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Tue, 24 Oct 2017 14:32:25 -0700 Subject: [PATCH 1/9] Set deployment target to 10.11 --- MySQLDriver.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MySQLDriver.xcodeproj/project.pbxproj b/MySQLDriver.xcodeproj/project.pbxproj index afb2403..603aca3 100644 --- a/MySQLDriver.xcodeproj/project.pbxproj +++ b/MySQLDriver.xcodeproj/project.pbxproj @@ -852,7 +852,7 @@ INFOPLIST_FILE = MySQLDriverMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriver; @@ -907,7 +907,7 @@ INFOPLIST_FILE = MySQLDriverMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriver; PRODUCT_NAME = "$(TARGET_NAME)"; From aa7475551d3c03ecefb426c5c61217a405869ad4 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Tue, 24 Oct 2017 14:32:57 -0700 Subject: [PATCH 2/9] Share schemes --- .../xcschemes/MySQLDriver.xcscheme | 101 ++++++++++++++++++ .../xcschemes/MySQLDriveriOS.xcscheme | 101 ++++++++++++++++++ 2 files changed, 202 insertions(+) create mode 100644 MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme create mode 100644 MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme diff --git a/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme new file mode 100644 index 0000000..3b1e7d8 --- /dev/null +++ b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme new file mode 100644 index 0000000..99b4678 --- /dev/null +++ b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c3c1c681a8a5843aa44cfc2c7ed0f9f9b27e1038 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Tue, 24 Oct 2017 14:33:57 -0700 Subject: [PATCH 3/9] Mark `Table.create:` methods `open` --- Sources/MySQLDriver/Table.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/MySQLDriver/Table.swift b/Sources/MySQLDriver/Table.swift index 7dd547a..357b574 100644 --- a/Sources/MySQLDriver/Table.swift +++ b/Sources/MySQLDriver/Table.swift @@ -95,7 +95,7 @@ public extension MySQL { /// Creates a new table based on a Swift Object using the connection - func create(_ object:Any, primaryKey:String?=nil, autoInc:Bool=false) throws { + open func create(_ object:Any, primaryKey:String?=nil, autoInc:Bool=false) throws { var v = "" let mirror = Mirror(reflecting: object) var count = mirror.children.count @@ -126,7 +126,7 @@ public extension MySQL { } /// Creates a new table based on a MySQL.RowStructure using the connection - func create(_ row:MySQL.Row, primaryKey:String?=nil, autoInc:Bool=false) throws { + open func create(_ row:MySQL.Row, primaryKey:String?=nil, autoInc:Bool=false) throws { var v = "" var count = row.count From f68e804983b0caf8fea412db988329e2e9c4aeb0 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Tue, 24 Oct 2017 14:34:07 -0700 Subject: [PATCH 4/9] Ignore xcuserdata --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8660aa3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*xcuserdata* From 4a8fbc041f5539dfd448e2bbbb85e9ead0d06986 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Tue, 24 Oct 2017 14:40:58 -0700 Subject: [PATCH 5/9] Set deployment target in another place --- MySQLDriver.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MySQLDriver.xcodeproj/project.pbxproj b/MySQLDriver.xcodeproj/project.pbxproj index 603aca3..a6d2548 100644 --- a/MySQLDriver.xcodeproj/project.pbxproj +++ b/MySQLDriver.xcodeproj/project.pbxproj @@ -769,6 +769,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; ONLY_ACTIVE_ARCH = YES; SWIFT_VERSION = 4.0; }; @@ -800,6 +801,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; }; @@ -1333,7 +1335,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = MySQLDriverTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = cc.MySQLDriverTests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1371,7 +1373,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; INFOPLIST_FILE = MySQLDriverTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = cc.MySQLDriverTests; PRODUCT_NAME = "$(TARGET_NAME)"; From ac6ec0ae91392fc9cc6782cebafa61a2f8c078a4 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Mon, 22 Jan 2018 10:20:25 -0800 Subject: [PATCH 6/9] Organize files to better handle multiple targets --- MySQLDriver.xcodeproj/project.pbxproj | 187 +++++++----------- ...riOS.xcscheme => MySQLDriver-iOS.xcscheme} | 20 +- ...er.xcscheme => MySQLDriver-macOS.xcscheme} | 12 +- MySQLDriverTests/Info.plist | 22 --- MySQLDriverTests/MySQLDriverTests.swift | 34 ---- .../MySQLSampleOSX}/main.swift | 0 .../MySQLSampleiOS}/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 0 .../MySQLSampleiOS}/Info.plist | 0 .../MySQLSampleiOS}/ViewController.swift | 0 {MySQLDriveriOS => Sources}/Info.plist | 0 .../MySQLDriverMacTests.swift | 0 .../MySQLDriveriOSTests.swift | 2 +- 15 files changed, 89 insertions(+), 188 deletions(-) rename MySQLDriver.xcodeproj/xcshareddata/xcschemes/{MySQLDriveriOS.xcscheme => MySQLDriver-iOS.xcscheme} (86%) rename MySQLDriver.xcodeproj/xcshareddata/xcschemes/{MySQLDriver.xcscheme => MySQLDriver-macOS.xcscheme} (91%) delete mode 100644 MySQLDriverTests/Info.plist delete mode 100644 MySQLDriverTests/MySQLDriverTests.swift rename {MySQLSampleOSX => Samples/MySQLSampleOSX}/main.swift (100%) rename {MySQLSampleiOS => Samples/MySQLSampleiOS}/AppDelegate.swift (100%) rename {MySQLSampleiOS => Samples/MySQLSampleiOS}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {MySQLSampleiOS => Samples/MySQLSampleiOS}/Base.lproj/LaunchScreen.storyboard (100%) rename {MySQLSampleiOS => Samples/MySQLSampleiOS}/Base.lproj/Main.storyboard (100%) rename {MySQLSampleiOS => Samples/MySQLSampleiOS}/Info.plist (100%) rename {MySQLSampleiOS => Samples/MySQLSampleiOS}/ViewController.swift (100%) rename {MySQLDriveriOS => Sources}/Info.plist (100%) rename {MySQLDriverMacTests => Tests}/MySQLDriverMacTests.swift (100%) rename {MySQLDriveriOSTests => Tests}/MySQLDriveriOSTests.swift (99%) diff --git a/MySQLDriver.xcodeproj/project.pbxproj b/MySQLDriver.xcodeproj/project.pbxproj index a6d2548..f75203f 100644 --- a/MySQLDriver.xcodeproj/project.pbxproj +++ b/MySQLDriver.xcodeproj/project.pbxproj @@ -7,18 +7,16 @@ objects = { /* Begin PBXBuildFile section */ - 3B28C3DD1C2D73E8008CA202 /* MySQLDriverMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B28C3DC1C2D73E8008CA202 /* MySQLDriverMac.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3B28C3F81C2D7423008CA202 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B28C3F71C2D7423008CA202 /* main.swift */; }; - 3B28C4041C2D74D4008CA202 /* MySQLDriveriOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B28C4031C2D74D4008CA202 /* MySQLDriveriOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3B28C40B1C2D74D4008CA202 /* MySQLDriveriOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C4011C2D74D4008CA202 /* MySQLDriveriOS.framework */; }; + 3B28C40B1C2D74D4008CA202 /* MySQLDriver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C4011C2D74D4008CA202 /* MySQLDriver.framework */; }; 3B28C4101C2D74D4008CA202 /* MySQLDriveriOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B28C40F1C2D74D4008CA202 /* MySQLDriveriOSTests.swift */; }; 3B28C4741C2D91B6008CA202 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B28C4731C2D91B6008CA202 /* AppDelegate.swift */; }; 3B28C4761C2D91B6008CA202 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B28C4751C2D91B6008CA202 /* ViewController.swift */; }; 3B28C4791C2D91B6008CA202 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B28C4771C2D91B6008CA202 /* Main.storyboard */; }; 3B28C47B1C2D91B6008CA202 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3B28C47A1C2D91B6008CA202 /* Assets.xcassets */; }; 3B28C47E1C2D91B6008CA202 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3B28C47C1C2D91B6008CA202 /* LaunchScreen.storyboard */; }; - 3B28C4831C2D91D1008CA202 /* MySQLDriveriOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C4011C2D74D4008CA202 /* MySQLDriveriOS.framework */; }; - 3B28C4841C2D91D1008CA202 /* MySQLDriveriOS.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C4011C2D74D4008CA202 /* MySQLDriveriOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 3B28C4831C2D91D1008CA202 /* MySQLDriver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C4011C2D74D4008CA202 /* MySQLDriver.framework */; }; + 3B28C4841C2D91D1008CA202 /* MySQLDriver.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C4011C2D74D4008CA202 /* MySQLDriver.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3BC37ADE1C948A3E00C0B9E7 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC37AD01C948A3E00C0B9E7 /* Connection.swift */; }; 3BC37AE01C948A3E00C0B9E7 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC37AD01C948A3E00C0B9E7 /* Connection.swift */; }; 3BC37AE11C948A3E00C0B9E7 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC37AD01C948A3E00C0B9E7 /* Connection.swift */; }; @@ -84,9 +82,8 @@ 3BC37B2F1C948A3F00C0B9E7 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC37ADD1C948A3E00C0B9E7 /* Utils.swift */; }; 3BC37B301C948A3F00C0B9E7 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC37ADD1C948A3E00C0B9E7 /* Utils.swift */; }; 3BC37B311C948A3F00C0B9E7 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC37ADD1C948A3E00C0B9E7 /* Utils.swift */; }; - B0F16B4C1F97728700AAAFDB /* MySQLDriverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0F16B4B1F97728700AAAFDB /* MySQLDriverTests.swift */; }; + 627B380E2016625F0029FDC1 /* MySQLDriverMacTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B28C3E81C2D73E8008CA202 /* MySQLDriverMacTests.swift */; }; B0F16B4E1F97728700AAAFDB /* MySQLDriver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B28C3D91C2D73E8008CA202 /* MySQLDriver.framework */; }; - B0F16B541F9772DB00AAAFDB /* MySQLDriverMacTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B28C3E81C2D73E8008CA202 /* MySQLDriverMacTests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -129,7 +126,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B28C4841C2D91D1008CA202 /* MySQLDriveriOS.framework in Embed Frameworks */, + 3B28C4841C2D91D1008CA202 /* MySQLDriver.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -138,18 +135,13 @@ /* Begin PBXFileReference section */ 3B28C3D91C2D73E8008CA202 /* MySQLDriver.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MySQLDriver.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B28C3DC1C2D73E8008CA202 /* MySQLDriverMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MySQLDriverMac.h; sourceTree = ""; }; - 3B28C3DE1C2D73E8008CA202 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3B28C3E81C2D73E8008CA202 /* MySQLDriverMacTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MySQLDriverMacTests.swift; sourceTree = ""; }; - 3B28C3EA1C2D73E8008CA202 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3B28C3F51C2D7423008CA202 /* MySQLSampleOSX */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MySQLSampleOSX; sourceTree = BUILT_PRODUCTS_DIR; }; 3B28C3F71C2D7423008CA202 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; - 3B28C4011C2D74D4008CA202 /* MySQLDriveriOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MySQLDriveriOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B28C4031C2D74D4008CA202 /* MySQLDriveriOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MySQLDriveriOS.h; sourceTree = ""; }; + 3B28C4011C2D74D4008CA202 /* MySQLDriver.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MySQLDriver.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B28C4051C2D74D4008CA202 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3B28C40A1C2D74D4008CA202 /* MySQLDriveriOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MySQLDriveriOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B28C40A1C2D74D4008CA202 /* MySQLDriverTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "MySQLDriverTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 3B28C40F1C2D74D4008CA202 /* MySQLDriveriOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MySQLDriveriOSTests.swift; sourceTree = ""; }; - 3B28C4111C2D74D4008CA202 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3B28C4181C2D74FD008CA202 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; 3B28C4711C2D91B5008CA202 /* MySQLSampleiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MySQLSampleiOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3B28C4731C2D91B6008CA202 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -171,9 +163,7 @@ 3BC37ADB1C948A3E00C0B9E7 /* Table.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Table.swift; sourceTree = ""; }; 3BC37ADC1C948A3E00C0B9E7 /* tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = tests.swift; sourceTree = ""; }; 3BC37ADD1C948A3E00C0B9E7 /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; - B0F16B491F97728700AAAFDB /* MySQLDriverTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MySQLDriverTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - B0F16B4B1F97728700AAAFDB /* MySQLDriverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MySQLDriverTests.swift; sourceTree = ""; }; - B0F16B4D1F97728700AAAFDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B0F16B491F97728700AAAFDB /* MySQLDriverTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "MySQLDriverTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -202,7 +192,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3B28C40B1C2D74D4008CA202 /* MySQLDriveriOS.framework in Frameworks */, + 3B28C40B1C2D74D4008CA202 /* MySQLDriver.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -210,7 +200,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3B28C4831C2D91D1008CA202 /* MySQLDriveriOS.framework in Frameworks */, + 3B28C4831C2D91D1008CA202 /* MySQLDriver.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -228,6 +218,7 @@ 3B1392B11C2F3C1C00AA463B /* Sources */ = { isa = PBXGroup; children = ( + 3B28C4051C2D74D4008CA202 /* Info.plist */, 3BC37ACF1C948A3E00C0B9E7 /* MySQLDriver */, ); path = Sources; @@ -238,13 +229,8 @@ children = ( 3B28C4181C2D74FD008CA202 /* Package.swift */, 3B1392B11C2F3C1C00AA463B /* Sources */, - 3B28C3DB1C2D73E8008CA202 /* MySQLDriver */, - 3B28C3E71C2D73E8008CA202 /* MySQLDriverMacTests */, - 3B28C3F61C2D7423008CA202 /* MySQLSampleOSX */, - 3B28C4021C2D74D4008CA202 /* MySQLDriveriOS */, - 3B28C40E1C2D74D4008CA202 /* MySQLDriveriOSTests */, - 3B28C4721C2D91B6008CA202 /* MySQLSampleiOS */, - B0F16B4A1F97728700AAAFDB /* MySQLDriverTests */, + 627B380B2016612B0029FDC1 /* Tests */, + 627B380D201661A90029FDC1 /* Samples */, 3B28C3DA1C2D73E8008CA202 /* Products */, B0F16B431F976B2600AAAFDB /* Frameworks */, ); @@ -255,33 +241,14 @@ children = ( 3B28C3D91C2D73E8008CA202 /* MySQLDriver.framework */, 3B28C3F51C2D7423008CA202 /* MySQLSampleOSX */, - 3B28C4011C2D74D4008CA202 /* MySQLDriveriOS.framework */, - 3B28C40A1C2D74D4008CA202 /* MySQLDriveriOSTests.xctest */, + 3B28C4011C2D74D4008CA202 /* MySQLDriver.framework */, + 3B28C40A1C2D74D4008CA202 /* MySQLDriverTests-iOS.xctest */, 3B28C4711C2D91B5008CA202 /* MySQLSampleiOS.app */, - B0F16B491F97728700AAAFDB /* MySQLDriverTests.xctest */, + B0F16B491F97728700AAAFDB /* MySQLDriverTests-macOS.xctest */, ); name = Products; sourceTree = ""; }; - 3B28C3DB1C2D73E8008CA202 /* MySQLDriver */ = { - isa = PBXGroup; - children = ( - 3B28C3DC1C2D73E8008CA202 /* MySQLDriverMac.h */, - 3B28C3DE1C2D73E8008CA202 /* Info.plist */, - ); - name = MySQLDriver; - path = MySQLDriverMac; - sourceTree = ""; - }; - 3B28C3E71C2D73E8008CA202 /* MySQLDriverMacTests */ = { - isa = PBXGroup; - children = ( - 3B28C3E81C2D73E8008CA202 /* MySQLDriverMacTests.swift */, - 3B28C3EA1C2D73E8008CA202 /* Info.plist */, - ); - path = MySQLDriverMacTests; - sourceTree = ""; - }; 3B28C3F61C2D7423008CA202 /* MySQLSampleOSX */ = { isa = PBXGroup; children = ( @@ -290,24 +257,6 @@ path = MySQLSampleOSX; sourceTree = ""; }; - 3B28C4021C2D74D4008CA202 /* MySQLDriveriOS */ = { - isa = PBXGroup; - children = ( - 3B28C4031C2D74D4008CA202 /* MySQLDriveriOS.h */, - 3B28C4051C2D74D4008CA202 /* Info.plist */, - ); - path = MySQLDriveriOS; - sourceTree = ""; - }; - 3B28C40E1C2D74D4008CA202 /* MySQLDriveriOSTests */ = { - isa = PBXGroup; - children = ( - 3B28C40F1C2D74D4008CA202 /* MySQLDriveriOSTests.swift */, - 3B28C4111C2D74D4008CA202 /* Info.plist */, - ); - path = MySQLDriveriOSTests; - sourceTree = ""; - }; 3B28C4721C2D91B6008CA202 /* MySQLSampleiOS */ = { isa = PBXGroup; children = ( @@ -341,20 +290,29 @@ path = MySQLDriver; sourceTree = ""; }; - B0F16B431F976B2600AAAFDB /* Frameworks */ = { + 627B380B2016612B0029FDC1 /* Tests */ = { isa = PBXGroup; children = ( + 3B28C3E81C2D73E8008CA202 /* MySQLDriverMacTests.swift */, + 3B28C40F1C2D74D4008CA202 /* MySQLDriveriOSTests.swift */, ); - name = Frameworks; + path = Tests; sourceTree = ""; }; - B0F16B4A1F97728700AAAFDB /* MySQLDriverTests */ = { + 627B380D201661A90029FDC1 /* Samples */ = { isa = PBXGroup; children = ( - B0F16B4B1F97728700AAAFDB /* MySQLDriverTests.swift */, - B0F16B4D1F97728700AAAFDB /* Info.plist */, + 3B28C4721C2D91B6008CA202 /* MySQLSampleiOS */, + 3B28C3F61C2D7423008CA202 /* MySQLSampleOSX */, ); - path = MySQLDriverTests; + path = Samples; + sourceTree = ""; + }; + B0F16B431F976B2600AAAFDB /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -364,7 +322,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3B28C3DD1C2D73E8008CA202 /* MySQLDriverMac.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -372,16 +329,15 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 3B28C4041C2D74D4008CA202 /* MySQLDriveriOS.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 3B28C3D81C2D73E8008CA202 /* MySQLDriver */ = { + 3B28C3D81C2D73E8008CA202 /* MySQLDriver-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 3B28C3EB1C2D73E8008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriver" */; + buildConfigurationList = 3B28C3EB1C2D73E8008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriver-macOS" */; buildPhases = ( 3B28C3D41C2D73E8008CA202 /* Sources */, 3B28C3D51C2D73E8008CA202 /* Frameworks */, @@ -392,7 +348,7 @@ ); dependencies = ( ); - name = MySQLDriver; + name = "MySQLDriver-macOS"; productName = MySQLDriverMac; productReference = 3B28C3D91C2D73E8008CA202 /* MySQLDriver.framework */; productType = "com.apple.product-type.framework"; @@ -414,9 +370,9 @@ productReference = 3B28C3F51C2D7423008CA202 /* MySQLSampleOSX */; productType = "com.apple.product-type.tool"; }; - 3B28C4001C2D74D4008CA202 /* MySQLDriveriOS */ = { + 3B28C4001C2D74D4008CA202 /* MySQLDriver-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 3B28C4121C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriveriOS" */; + buildConfigurationList = 3B28C4121C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriver-iOS" */; buildPhases = ( 3B28C3FC1C2D74D4008CA202 /* Sources */, 3B28C3FD1C2D74D4008CA202 /* Frameworks */, @@ -427,14 +383,14 @@ ); dependencies = ( ); - name = MySQLDriveriOS; + name = "MySQLDriver-iOS"; productName = MySQLDriveriOS; - productReference = 3B28C4011C2D74D4008CA202 /* MySQLDriveriOS.framework */; + productReference = 3B28C4011C2D74D4008CA202 /* MySQLDriver.framework */; productType = "com.apple.product-type.framework"; }; - 3B28C4091C2D74D4008CA202 /* MySQLDriveriOSTests */ = { + 3B28C4091C2D74D4008CA202 /* MySQLDriverTests-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 3B28C4151C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriveriOSTests" */; + buildConfigurationList = 3B28C4151C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriverTests-iOS" */; buildPhases = ( 3B28C4061C2D74D4008CA202 /* Sources */, 3B28C4071C2D74D4008CA202 /* Frameworks */, @@ -445,9 +401,9 @@ dependencies = ( 3B28C40D1C2D74D4008CA202 /* PBXTargetDependency */, ); - name = MySQLDriveriOSTests; + name = "MySQLDriverTests-iOS"; productName = MySQLDriveriOSTests; - productReference = 3B28C40A1C2D74D4008CA202 /* MySQLDriveriOSTests.xctest */; + productReference = 3B28C40A1C2D74D4008CA202 /* MySQLDriverTests-iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; 3B28C4701C2D91B5008CA202 /* MySQLSampleiOS */ = { @@ -469,9 +425,9 @@ productReference = 3B28C4711C2D91B5008CA202 /* MySQLSampleiOS.app */; productType = "com.apple.product-type.application"; }; - B0F16B481F97728700AAAFDB /* MySQLDriverTests */ = { + B0F16B481F97728700AAAFDB /* MySQLDriverTests-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = B0F16B511F97728700AAAFDB /* Build configuration list for PBXNativeTarget "MySQLDriverTests" */; + buildConfigurationList = B0F16B511F97728700AAAFDB /* Build configuration list for PBXNativeTarget "MySQLDriverTests-macOS" */; buildPhases = ( B0F16B451F97728700AAAFDB /* Sources */, B0F16B461F97728700AAAFDB /* Frameworks */, @@ -482,9 +438,9 @@ dependencies = ( B0F16B501F97728700AAAFDB /* PBXTargetDependency */, ); - name = MySQLDriverTests; + name = "MySQLDriverTests-macOS"; productName = MySQLDriverTests; - productReference = B0F16B491F97728700AAAFDB /* MySQLDriverTests.xctest */; + productReference = B0F16B491F97728700AAAFDB /* MySQLDriverTests-macOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -510,7 +466,7 @@ }; 3B28C4091C2D74D4008CA202 = { CreatedOnToolsVersion = 7.2; - DevelopmentTeam = V78YG58T49; + DevelopmentTeam = A76BV63T8L; LastSwiftMigration = 0810; }; 3B28C4701C2D91B5008CA202 = { @@ -519,7 +475,7 @@ }; B0F16B481F97728700AAAFDB = { CreatedOnToolsVersion = 9.0.1; - DevelopmentTeam = V78YG58T49; + DevelopmentTeam = A76BV63T8L; ProvisioningStyle = Automatic; }; }; @@ -537,11 +493,11 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 3B28C3D81C2D73E8008CA202 /* MySQLDriver */, - B0F16B481F97728700AAAFDB /* MySQLDriverTests */, + 3B28C3D81C2D73E8008CA202 /* MySQLDriver-macOS */, + 3B28C4001C2D74D4008CA202 /* MySQLDriver-iOS */, + B0F16B481F97728700AAAFDB /* MySQLDriverTests-macOS */, 3B28C3F41C2D7423008CA202 /* MySQLSampleOSX */, - 3B28C4001C2D74D4008CA202 /* MySQLDriveriOS */, - 3B28C4091C2D74D4008CA202 /* MySQLDriveriOSTests */, + 3B28C4091C2D74D4008CA202 /* MySQLDriverTests-iOS */, 3B28C4701C2D91B5008CA202 /* MySQLSampleiOS */, ); }; @@ -697,8 +653,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - B0F16B541F9772DB00AAAFDB /* MySQLDriverMacTests.swift in Sources */, - B0F16B4C1F97728700AAAFDB /* MySQLDriverTests.swift in Sources */, + 627B380E2016625F0029FDC1 /* MySQLDriverMacTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -707,17 +662,17 @@ /* Begin PBXTargetDependency section */ 3B28C40D1C2D74D4008CA202 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3B28C4001C2D74D4008CA202 /* MySQLDriveriOS */; + target = 3B28C4001C2D74D4008CA202 /* MySQLDriver-iOS */; targetProxy = 3B28C40C1C2D74D4008CA202 /* PBXContainerItemProxy */; }; 3B28C4861C2D91D1008CA202 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3B28C4001C2D74D4008CA202 /* MySQLDriveriOS */; + target = 3B28C4001C2D74D4008CA202 /* MySQLDriver-iOS */; targetProxy = 3B28C4851C2D91D1008CA202 /* PBXContainerItemProxy */; }; B0F16B501F97728700AAAFDB /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3B28C3D81C2D73E8008CA202 /* MySQLDriver */; + target = 3B28C3D81C2D73E8008CA202 /* MySQLDriver-macOS */; targetProxy = B0F16B4F1F97728700AAAFDB /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -858,7 +813,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriver; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = MySQLDriver; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -912,7 +867,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriver; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = MySQLDriver; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_VERSION = 4.0; @@ -1046,14 +1001,14 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = MySQLDriveriOS/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriveriOS; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriver; + PRODUCT_NAME = MySQLDriver; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1099,13 +1054,13 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = MySQLDriveriOS/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriveriOS; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriver; + PRODUCT_NAME = MySQLDriver; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; @@ -1136,6 +1091,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = A76BV63T8L; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1185,6 +1141,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = A76BV63T8L; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1323,7 +1280,7 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = V78YG58T49; + DEVELOPMENT_TEAM = A76BV63T8L; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1366,7 +1323,7 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = V78YG58T49; + DEVELOPMENT_TEAM = A76BV63T8L; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -1395,7 +1352,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3B28C3EB1C2D73E8008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriver" */ = { + 3B28C3EB1C2D73E8008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriver-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 3B28C3EC1C2D73E8008CA202 /* Debug */, @@ -1413,7 +1370,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3B28C4121C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriveriOS" */ = { + 3B28C4121C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriver-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 3B28C4131C2D74D4008CA202 /* Debug */, @@ -1422,7 +1379,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3B28C4151C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriveriOSTests" */ = { + 3B28C4151C2D74D4008CA202 /* Build configuration list for PBXNativeTarget "MySQLDriverTests-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 3B28C4161C2D74D4008CA202 /* Debug */, @@ -1440,7 +1397,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B0F16B511F97728700AAAFDB /* Build configuration list for PBXNativeTarget "MySQLDriverTests" */ = { + B0F16B511F97728700AAAFDB /* Build configuration list for PBXNativeTarget "MySQLDriverTests-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B0F16B521F97728700AAAFDB /* Debug */, diff --git a/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-iOS.xcscheme similarity index 86% rename from MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme rename to MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-iOS.xcscheme index 99b4678..5394344 100644 --- a/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriveriOS.xcscheme +++ b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-iOS.xcscheme @@ -15,8 +15,8 @@ @@ -34,8 +34,8 @@ @@ -44,8 +44,8 @@ @@ -67,8 +67,8 @@ @@ -85,8 +85,8 @@ diff --git a/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-macOS.xcscheme similarity index 91% rename from MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme rename to MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-macOS.xcscheme index 3b1e7d8..7ed64bb 100644 --- a/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver.xcscheme +++ b/MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-macOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "3B28C3D81C2D73E8008CA202" BuildableName = "MySQLDriver.framework" - BlueprintName = "MySQLDriver" + BlueprintName = "MySQLDriver-macOS" ReferencedContainer = "container:MySQLDriver.xcodeproj"> @@ -34,8 +34,8 @@ @@ -45,7 +45,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "3B28C3D81C2D73E8008CA202" BuildableName = "MySQLDriver.framework" - BlueprintName = "MySQLDriver" + BlueprintName = "MySQLDriver-macOS" ReferencedContainer = "container:MySQLDriver.xcodeproj"> @@ -68,7 +68,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "3B28C3D81C2D73E8008CA202" BuildableName = "MySQLDriver.framework" - BlueprintName = "MySQLDriver" + BlueprintName = "MySQLDriver-macOS" ReferencedContainer = "container:MySQLDriver.xcodeproj"> @@ -86,7 +86,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "3B28C3D81C2D73E8008CA202" BuildableName = "MySQLDriver.framework" - BlueprintName = "MySQLDriver" + BlueprintName = "MySQLDriver-macOS" ReferencedContainer = "container:MySQLDriver.xcodeproj"> diff --git a/MySQLDriverTests/Info.plist b/MySQLDriverTests/Info.plist deleted file mode 100644 index 6c40a6c..0000000 --- a/MySQLDriverTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/MySQLDriverTests/MySQLDriverTests.swift b/MySQLDriverTests/MySQLDriverTests.swift deleted file mode 100644 index 0903dfa..0000000 --- a/MySQLDriverTests/MySQLDriverTests.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// MySQLDriverTests.swift -// MySQLDriverTests -// -// Created by Marius Corega on 18.10.17. -// - -import XCTest - -class MySQLDriverTests: XCTestCase { - - override func setUp() { - super.setUp() - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - super.tearDown() - } - - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/MySQLSampleOSX/main.swift b/Samples/MySQLSampleOSX/main.swift similarity index 100% rename from MySQLSampleOSX/main.swift rename to Samples/MySQLSampleOSX/main.swift diff --git a/MySQLSampleiOS/AppDelegate.swift b/Samples/MySQLSampleiOS/AppDelegate.swift similarity index 100% rename from MySQLSampleiOS/AppDelegate.swift rename to Samples/MySQLSampleiOS/AppDelegate.swift diff --git a/MySQLSampleiOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Samples/MySQLSampleiOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from MySQLSampleiOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Samples/MySQLSampleiOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/MySQLSampleiOS/Base.lproj/LaunchScreen.storyboard b/Samples/MySQLSampleiOS/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from MySQLSampleiOS/Base.lproj/LaunchScreen.storyboard rename to Samples/MySQLSampleiOS/Base.lproj/LaunchScreen.storyboard diff --git a/MySQLSampleiOS/Base.lproj/Main.storyboard b/Samples/MySQLSampleiOS/Base.lproj/Main.storyboard similarity index 100% rename from MySQLSampleiOS/Base.lproj/Main.storyboard rename to Samples/MySQLSampleiOS/Base.lproj/Main.storyboard diff --git a/MySQLSampleiOS/Info.plist b/Samples/MySQLSampleiOS/Info.plist similarity index 100% rename from MySQLSampleiOS/Info.plist rename to Samples/MySQLSampleiOS/Info.plist diff --git a/MySQLSampleiOS/ViewController.swift b/Samples/MySQLSampleiOS/ViewController.swift similarity index 100% rename from MySQLSampleiOS/ViewController.swift rename to Samples/MySQLSampleiOS/ViewController.swift diff --git a/MySQLDriveriOS/Info.plist b/Sources/Info.plist similarity index 100% rename from MySQLDriveriOS/Info.plist rename to Sources/Info.plist diff --git a/MySQLDriverMacTests/MySQLDriverMacTests.swift b/Tests/MySQLDriverMacTests.swift similarity index 100% rename from MySQLDriverMacTests/MySQLDriverMacTests.swift rename to Tests/MySQLDriverMacTests.swift diff --git a/MySQLDriveriOSTests/MySQLDriveriOSTests.swift b/Tests/MySQLDriveriOSTests.swift similarity index 99% rename from MySQLDriveriOSTests/MySQLDriveriOSTests.swift rename to Tests/MySQLDriveriOSTests.swift index 4844eb6..af80ad8 100644 --- a/MySQLDriveriOSTests/MySQLDriveriOSTests.swift +++ b/Tests/MySQLDriveriOSTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import MySQLDriveriOS +@testable import MySQLDriver class MySQLDriveriOSTests: XCTestCase { From aa38575a650a0e8888c380285980a1c260491ee6 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Mon, 22 Jan 2018 10:23:26 -0800 Subject: [PATCH 7/9] Remove dev team signing --- MySQLDriver.xcodeproj/project.pbxproj | 34 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/MySQLDriver.xcodeproj/project.pbxproj b/MySQLDriver.xcodeproj/project.pbxproj index f75203f..df74252 100644 --- a/MySQLDriver.xcodeproj/project.pbxproj +++ b/MySQLDriver.xcodeproj/project.pbxproj @@ -458,6 +458,7 @@ }; 3B28C3F41C2D7423008CA202 = { CreatedOnToolsVersion = 7.2; + ProvisioningStyle = Automatic; }; 3B28C4001C2D74D4008CA202 = { CreatedOnToolsVersion = 7.2; @@ -466,16 +467,15 @@ }; 3B28C4091C2D74D4008CA202 = { CreatedOnToolsVersion = 7.2; - DevelopmentTeam = A76BV63T8L; LastSwiftMigration = 0810; + ProvisioningStyle = Automatic; }; 3B28C4701C2D91B5008CA202 = { CreatedOnToolsVersion = 7.2; - DevelopmentTeam = V78YG58T49; + ProvisioningStyle = Automatic; }; B0F16B481F97728700AAAFDB = { CreatedOnToolsVersion = 9.0.1; - DevelopmentTeam = A76BV63T8L; ProvisioningStyle = Automatic; }; }; @@ -894,9 +894,11 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -917,6 +919,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -940,9 +943,11 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -956,6 +961,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; }; name = Release; @@ -1089,9 +1095,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = A76BV63T8L; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1115,6 +1122,7 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriveriOSTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; @@ -1139,9 +1147,10 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = A76BV63T8L; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1158,6 +1167,7 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLDriveriOSTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_VERSION = 3.0; VALIDATE_PRODUCT = YES; @@ -1185,8 +1195,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1210,6 +1222,7 @@ ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLSampleiOS; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1237,8 +1250,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1255,6 +1270,7 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = mcorega.MySQLSampleiOS; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1280,7 +1296,7 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = A76BV63T8L; + DEVELOPMENT_TEAM = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1323,7 +1339,7 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = A76BV63T8L; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; From dea065ce675258084c9227ac935de31dd6d61922 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Mon, 22 Jan 2018 10:27:35 -0800 Subject: [PATCH 8/9] Remove unused files --- MySQLDriverMac/Info.plist | 26 -------------------------- MySQLDriverMac/MySQLDriverMac.h | 19 ------------------- MySQLDriverMacTests/Info.plist | 24 ------------------------ MySQLDriveriOS/MySQLDriveriOS.h | 19 ------------------- MySQLDriveriOSTests/Info.plist | 24 ------------------------ 5 files changed, 112 deletions(-) delete mode 100644 MySQLDriverMac/Info.plist delete mode 100644 MySQLDriverMac/MySQLDriverMac.h delete mode 100644 MySQLDriverMacTests/Info.plist delete mode 100644 MySQLDriveriOS/MySQLDriveriOS.h delete mode 100644 MySQLDriveriOSTests/Info.plist diff --git a/MySQLDriverMac/Info.plist b/MySQLDriverMac/Info.plist deleted file mode 100644 index d3de8ee..0000000 --- a/MySQLDriverMac/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/MySQLDriverMac/MySQLDriverMac.h b/MySQLDriverMac/MySQLDriverMac.h deleted file mode 100644 index f02af11..0000000 --- a/MySQLDriverMac/MySQLDriverMac.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MySQLDriverMac.h -// MySQLDriverMac -// -// Created by cipi on 25/12/15. -// -// - -#import - -//! Project version number for MySQLDriverMac. -FOUNDATION_EXPORT double MySQLDriverMacVersionNumber; - -//! Project version string for MySQLDriverMac. -FOUNDATION_EXPORT const unsigned char MySQLDriverMacVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/MySQLDriverMacTests/Info.plist b/MySQLDriverMacTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/MySQLDriverMacTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/MySQLDriveriOS/MySQLDriveriOS.h b/MySQLDriveriOS/MySQLDriveriOS.h deleted file mode 100644 index d621862..0000000 --- a/MySQLDriveriOS/MySQLDriveriOS.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// MySQLDriveriOS.h -// MySQLDriveriOS -// -// Created by cipi on 25/12/15. -// -// - -#import - -//! Project version number for MySQLDriveriOS. -FOUNDATION_EXPORT double MySQLDriveriOSVersionNumber; - -//! Project version string for MySQLDriveriOS. -FOUNDATION_EXPORT const unsigned char MySQLDriveriOSVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/MySQLDriveriOSTests/Info.plist b/MySQLDriveriOSTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/MySQLDriveriOSTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - From cf5fa18bf5a50cc33128fe05e9ef535ae698b8a5 Mon Sep 17 00:00:00 2001 From: Emory Dunn Date: Mon, 22 Jan 2018 10:29:12 -0800 Subject: [PATCH 9/9] Set Info.plist on macOS target --- MySQLDriver.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MySQLDriver.xcodeproj/project.pbxproj b/MySQLDriver.xcodeproj/project.pbxproj index df74252..f8c4fc5 100644 --- a/MySQLDriver.xcodeproj/project.pbxproj +++ b/MySQLDriver.xcodeproj/project.pbxproj @@ -806,7 +806,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = MySQLDriverMac/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -861,7 +861,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = MySQLDriverMac/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11;