Refactored project structure

Moved framework target to root as main project. Moved tests to main project. Added static library target to main project. Removed CocoaPods from Example project. Removed KIF Acceptance Tests. Added framework header and set visibility accordingly in framework target.
codeguru85 · Oct 17, 2015 · 3f11ed9 · 3f11ed9
1 parent 87e3105
commit 3f11ed9
Show file tree

Hide file tree

Showing 28 changed files with 868 additions and 1,434 deletions.
diff --git a/CRToast.podspec b/CRToast.podspec
@@ -11,5 +11,5 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '7.0'
 
   s.source_files = "CRToast/*.{h,m}"
-  s.public_header_files = "CRToast/CRToast.h", "CRToast/CRToastManager.h", "CRToast/CRToastView.h"
+  s.public_header_files = "CRToast/CRToast.h", "CRToast/CRToastConfig.h", "CRToast/CRToastManager.h"
 end
diff --git a/...CRToastCarthage.xcodeproj/project.pbxproj → CRToast.xcodeproj/project.pbxproj b/...CRToastCarthage.xcodeproj/project.pbxproj → CRToast.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...hareddata/xcschemes/CRToastTests.xcscheme → ...reddata/xcschemes/CRToast-static.xcscheme b/...hareddata/xcschemes/CRToastTests.xcscheme → ...reddata/xcschemes/CRToast-static.xcscheme
@@ -1,77 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5E2FFB5218367C01003333F8"
-               BuildableName = "CRToastDemo.app"
-               BlueprintName = "CRToastDemo"
-               ReferencedContainer = "container:CRToastDemo.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D8F2E0718CED50A0077A7F6"
-               BuildableName = "CRToastTests.xctest"
-               BlueprintName = "CRToastTests"
-               ReferencedContainer = "container:CRToastDemo.xcodeproj">
+               BlueprintIdentifier = "464D04B51BD21BE600E0E90A"
+               BuildableName = "libCRToast.a"
+               BlueprintName = "CRToast-static"
+               ReferencedContainer = "container:CRToast.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">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D8F2E0718CED50A0077A7F6"
-               BuildableName = "CRToastTests.xctest"
-               BlueprintName = "CRToastTests"
-               ReferencedContainer = "container:CRToastDemo.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
+      <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">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "464D04B51BD21BE600E0E90A"
+            BuildableName = "libCRToast.a"
+            BlueprintName = "CRToast-static"
+            ReferencedContainer = "container:CRToast.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "464D04B51BD21BE600E0E90A"
+            BuildableName = "libCRToast.a"
+            BlueprintName = "CRToast-static"
+            ReferencedContainer = "container:CRToast.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/...eddata/xcschemes/CRToastCarthage.xcscheme → ...j/xcshareddata/xcschemes/CRToast.xcscheme b/...eddata/xcschemes/CRToastCarthage.xcscheme → ...j/xcshareddata/xcschemes/CRToast.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,64 +15,78 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "65986EC01B9E21DC00BCA1C3"
-               BuildableName = "CRToastCarthage.framework"
-               BlueprintName = "CRToastCarthage"
-               ReferencedContainer = "container:CRToastCarthage.xcodeproj">
+               BuildableName = "CRToast.framework"
+               BlueprintName = "CRToast"
+               ReferencedContainer = "container:CRToast.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "464D04C71BD2218900E0E90A"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
+               ReferencedContainer = "container:CRToast.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "65986EC01B9E21DC00BCA1C3"
-            BuildableName = "CRToastCarthage.framework"
-            BlueprintName = "CRToastCarthage"
-            ReferencedContainer = "container:CRToastCarthage.xcodeproj">
+            BuildableName = "CRToast.framework"
+            BlueprintName = "CRToast"
+            ReferencedContainer = "container:CRToast.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">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "65986EC01B9E21DC00BCA1C3"
-            BuildableName = "CRToastCarthage.framework"
-            BlueprintName = "CRToastCarthage"
-            ReferencedContainer = "container:CRToastCarthage.xcodeproj">
+            BuildableName = "CRToast.framework"
+            BlueprintName = "CRToast"
+            ReferencedContainer = "container:CRToast.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "65986EC01B9E21DC00BCA1C3"
-            BuildableName = "CRToastCarthage.framework"
-            BlueprintName = "CRToastCarthage"
-            ReferencedContainer = "container:CRToastCarthage.xcodeproj">
+            BuildableName = "CRToast.framework"
+            BlueprintName = "CRToast"
+            ReferencedContainer = "container:CRToast.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>