Skip to content

Commit

Permalink
Reorganize project structure (#29)
Browse files Browse the repository at this point in the history
- restructure project with distinct F53OSC directory separate from F53OSC Monitor targets
- add targets to manually build F53OSC.framework
- update .xcodeproj to Xcode 10.3
  • Loading branch information
balord authored Mar 26, 2020
1 parent 66fe5c5 commit 79df929
Show file tree
Hide file tree
Showing 60 changed files with 1,711 additions and 629 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
*.xcscmblueprint
*.xcscmblueprint

.build
.swiftpm
Packages

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// F53OSC Monitor
//
// Created by Adam Bachman on 8/5/15.
// Copyright (c) 2015 Figure 53. All rights reserved.
// Copyright (c) 2015-2020 Figure 53. All rights reserved.
//

#import <Cocoa/Cocoa.h>
#import "F53OSC.h"
#import <F53OSC/F53OSC.h>
#import "DemoServer.h"
#import "ActivityChartView.h"

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// F53OSC Monitor
//
// Created by Adam Bachman on 8/5/15.
// Copyright (c) 2015 Figure 53. All rights reserved.
// Copyright (c) 2015-2020 Figure 53. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "F53OSC.h"
#import <F53OSC/F53OSC.h>

@class AppDelegate;

Expand Down
File renamed without changes.
551 changes: 0 additions & 551 deletions F53OSC Monitor/F53OSC Monitor.xcodeproj/project.pbxproj

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.figure53.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
File renamed without changes.
7 changes: 3 additions & 4 deletions F53OSC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ Pod::Spec.new do |s|

s.platforms = { :ios => '8.4', :tvos => '9.0', :osx => '10.9' }
s.source = { :git => 'https://github.com/Figure53/F53OSC.git', :tag => "#{s.version}", }


s.source_files = '*.{h,m}'
s.requires_arc = true
s.source_files = [
'F53OSC/Sources/F53OSC/*.{h,m}',
]

s.exclude_files = 'F53OSC Monitor/*'

s.frameworks = 'Security', 'CFNetwork'
end
1,278 changes: 1,278 additions & 0 deletions F53OSC.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0640"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -17,39 +17,37 @@
BlueprintIdentifier = "66EE17511B729EA0008B6743"
BuildableName = "F53OSC Monitor.app"
BlueprintName = "F53OSC Monitor"
ReferencedContainer = "container:F53OSC Monitor.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "66EE17641B729EA0008B6743"
BuildableName = "F53OSC MonitorTests.xctest"
BlueprintName = "F53OSC MonitorTests"
ReferencedContainer = "container:F53OSC Monitor.xcodeproj">
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
skipped = "NO"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "66EE17641B729EA0008B6743"
BuildableName = "F53OSC MonitorTests.xctest"
BlueprintName = "F53OSC MonitorTests"
ReferencedContainer = "container:F53OSC Monitor.xcodeproj">
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0846242A7F5B00655E76"
BuildableName = "F53OSCTests.xctest"
BlueprintName = "F53OSCTests"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -59,18 +57,21 @@
BlueprintIdentifier = "66EE17511B729EA0008B6743"
BuildableName = "F53OSC Monitor.app"
BlueprintName = "F53OSC Monitor"
ReferencedContainer = "container:F53OSC Monitor.xcodeproj">
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand All @@ -79,17 +80,17 @@
BlueprintIdentifier = "66EE17511B729EA0008B6743"
BuildableName = "F53OSC Monitor.app"
BlueprintName = "F53OSC Monitor"
ReferencedContainer = "container:F53OSC Monitor.xcodeproj">
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand All @@ -98,7 +99,7 @@
BlueprintIdentifier = "66EE17511B729EA0008B6743"
BuildableName = "F53OSC Monitor.app"
BlueprintName = "F53OSC Monitor"
ReferencedContainer = "container:F53OSC Monitor.xcodeproj">
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down
89 changes: 89 additions & 0 deletions F53OSC.xcodeproj/xcshareddata/xcschemes/F53OSC-iOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0860242A81F600655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-iOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0860242A81F600655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-iOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0860242A81F600655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-iOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0860242A81F600655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-iOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
100 changes: 100 additions & 0 deletions F53OSC.xcodeproj/xcshareddata/xcschemes/F53OSC-macOS.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0853242A815100655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-macOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
testExecutionOrdering = "random">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0846242A7F5B00655E76"
BuildableName = "F53OSCTests.xctest"
BlueprintName = "F53OSCTests"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0853242A815100655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-macOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0853242A815100655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-macOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3D1E0853242A815100655E76"
BuildableName = "F53OSC.framework"
BlueprintName = "F53OSC-macOS"
ReferencedContainer = "container:F53OSC.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit 79df929

Please sign in to comment.