Merge pull request #9 from gonzalezreal/carthage

Carthage support
gonzalezreal · Mar 6, 2015 · 08d5d0b · 08d5d0b
2 parents 1fff1fe + 04b936f
commit 08d5d0b
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 295 deletions.
diff --git a/Groot.xcodeproj/project.pbxproj b/Groot.xcodeproj/project.pbxproj
diff --git a/...ille.xcuserdatad/xcschemes/Groot.xcscheme → ...roj/xcshareddata/xcschemes/Groot.xcscheme b/...ille.xcuserdatad/xcschemes/Groot.xcscheme → ...roj/xcshareddata/xcschemes/Groot.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,12 +14,26 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "99EB2D8519644636008FC282"
-               BuildableName = "libGroot.a"
+               BlueprintIdentifier = "B4DC1AEB1AA9CA5E00F67403"
+               BuildableName = "Groot.framework"
                BlueprintName = "Groot"
                ReferencedContainer = "container:Groot.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B4DC1AF61AA9CA5E00F67403"
+               BuildableName = "GrootTests.xctest"
+               BlueprintName = "GrootTests"
+               ReferencedContainer = "container:Groot.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -32,13 +46,22 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "99EB2D9519644636008FC282"
+               BlueprintIdentifier = "B4DC1AF61AA9CA5E00F67403"
                BuildableName = "GrootTests.xctest"
                BlueprintName = "GrootTests"
                ReferencedContainer = "container:Groot.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B4DC1AEB1AA9CA5E00F67403"
+            BuildableName = "Groot.framework"
+            BlueprintName = "Groot"
+            ReferencedContainer = "container:Groot.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -49,6 +72,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B4DC1AEB1AA9CA5E00F67403"
+            BuildableName = "Groot.framework"
+            BlueprintName = "Groot"
+            ReferencedContainer = "container:Groot.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -58,6 +90,15 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B4DC1AEB1AA9CA5E00F67403"
+            BuildableName = "Groot.framework"
+            BlueprintName = "Groot"
+            ReferencedContainer = "container:Groot.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Groot.xcodeproj/xcuserdata/guille.xcuserdatad/xcschemes/xcschememanagement.plist b/Groot.xcodeproj/xcuserdata/guille.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Groot/Groot-Prefix.pch b/Groot/Groot-Prefix.pch
diff --git a/Groot/Groot.h b/Groot/Groot.h
@@ -20,6 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#import <UIKit/UIKit.h>
+
+//! Project version number for Groot.
+FOUNDATION_EXPORT double GrootVersionNumber;
+
+//! Project version string for Groot.
+FOUNDATION_EXPORT const unsigned char GrootVersionString[];
+
 #import <Groot/GRTManagedStore.h>
 #import <Groot/GRTValueTransformer.h>
 #import <Groot/GRTJSONSerialization.h>
diff --git a/Groot/Info.plist b/Groot/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/GrootTests/GrootTests-Info.plist → GrootTests/Info.plist b/GrootTests/GrootTests-Info.plist → GrootTests/Info.plist
@@ -5,11 +5,13 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.gonzalezreal.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.gonzalezreal.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>

diff --git a/GrootTests/en.lproj/InfoPlist.strings b/GrootTests/en.lproj/InfoPlist.strings