Skip to content

Include macOS Target #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emorydunn wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Include macOS Target #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb915a2
Set deployment target to 10.11
emorydunn Oct 24, 2017
aa74755
Share schemes
emorydunn Oct 24, 2017
c3c1c68
Mark `Table.create:` methods `open`
emorydunn Oct 24, 2017
f68e804
Ignore xcuserdata
emorydunn Oct 24, 2017
4a8fbc0
Set deployment target in another place
emorydunn Oct 24, 2017
ac6ec0a
Organize files to better handle multiple targets
emorydunn Jan 22, 2018
aa38575
Remove dev team signing
emorydunn Jan 22, 2018
dea065c
Remove unused files
emorydunn Jan 22, 2018
cf5fa18
Set Info.plist on macOS target
emorydunn Jan 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*xcuserdata*
223 changes: 99 additions & 124 deletions MySQLDriver.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

101 changes: 101 additions & 0 deletions MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C4001C2D74D4008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-iOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C4091C2D74D4008CA202"
BuildableName = "MySQLDriverTests-iOS.xctest"
BlueprintName = "MySQLDriverTests-iOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C4001C2D74D4008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-iOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C4001C2D74D4008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-iOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C4001C2D74D4008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-iOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
101 changes: 101 additions & 0 deletions MySQLDriver.xcodeproj/xcshareddata/xcschemes/MySQLDriver-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C3D81C2D73E8008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-macOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B0F16B481F97728700AAAFDB"
BuildableName = "MySQLDriverTests-macOS.xctest"
BlueprintName = "MySQLDriverTests-macOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C3D81C2D73E8008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-macOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C3D81C2D73E8008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-macOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3B28C3D81C2D73E8008CA202"
BuildableName = "MySQLDriver.framework"
BlueprintName = "MySQLDriver-macOS"
ReferencedContainer = "container:MySQLDriver.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
19 changes: 0 additions & 19 deletions MySQLDriverMac/MySQLDriverMac.h
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions MySQLDriverMacTests/Info.plist
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions MySQLDriverTests/Info.plist
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions MySQLDriverTests/MySQLDriverTests.swift
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions MySQLDriveriOS/Info.plist
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions MySQLDriveriOS/MySQLDriveriOS.h
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions MySQLDriveriOSTests/Info.plist
View file
Open in desktop

This file was deleted.

0 MySQLSampleOSX/main.swift → Samples/MySQLSampleOSX/main.swift
View file
Open in desktop
File renamed without changes.
0 MySQLSampleiOS/AppDelegate.swift → Samples/MySQLSampleiOS/AppDelegate.swift
View file
Open in desktop
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...pleiOS/Base.lproj/LaunchScreen.storyboard → ...pleiOS/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
File renamed without changes.
0 MySQLSampleiOS/Base.lproj/Main.storyboard → ...MySQLSampleiOS/Base.lproj/Main.storyboard
View file
Open in desktop
File renamed without changes.
0 MySQLSampleiOS/Info.plist → Samples/MySQLSampleiOS/Info.plist
View file
Open in desktop
File renamed without changes.
0 MySQLSampleiOS/ViewController.swift → Samples/MySQLSampleiOS/ViewController.swift
View file
Open in desktop
File renamed without changes.
0 MySQLDriverMac/Info.plist → Sources/Info.plist
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Sources/MySQLDriver/Table.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
0 ...LDriverMacTests/MySQLDriverMacTests.swift → Tests/MySQLDriverMacTests.swift
View file
Open in desktop
File renamed without changes.
Loading