Merge pull request #295 from carambalabs/#293

[#293] Carthage build error
modo-studio · Sep 28, 2016 · d66bbf5 · d66bbf5
2 parents d7a2d58 + 1f68c74
commit d66bbf5
Show file tree

Hide file tree

Showing 17 changed files with 1,840 additions and 2,012 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,8 @@ before_install:
 - gem install bundler
 - bundle install
 - bundle exec pod repo update --silent
+- brew update
+- brew outdated carthage || brew upgrade carthage
 - git remote set-url origin "https://${GITHUB_TOKEN}@github.com/carambalabs/SugarRecord.git"
 script:
 - bundle exec fastlane travis

diff --git a/Carthage.xcodeproj/project.pbxproj b/Carthage.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/...shareddata/xcschemes/iOSCoreData.xcscheme → ...shareddata/xcschemes/iOSCoreData.xcscheme b/...shareddata/xcschemes/iOSCoreData.xcscheme → ...shareddata/xcschemes/iOSCoreData.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4691D7DD8A500ACBC3A"
                BuildableName = "SugarRecordCoreData.framework"
                BlueprintName = "iOSCoreData"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4691D7DD8A500ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "iOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4691D7DD8A500ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "iOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/.../xcshareddata/xcschemes/iOSRealm.xcscheme → .../xcshareddata/xcschemes/iOSRealm.xcscheme b/.../xcshareddata/xcschemes/iOSRealm.xcscheme → .../xcshareddata/xcschemes/iOSRealm.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4C01D7DDA1400ACBC3A"
                BuildableName = "SugarRecord.framework"
                BlueprintName = "iOSRealm"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4C01D7DDA1400ACBC3A"
             BuildableName = "SugarRecord.framework"
             BlueprintName = "iOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4C01D7DDA1400ACBC3A"
             BuildableName = "SugarRecord.framework"
             BlueprintName = "iOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...areddata/xcschemes/macOSCoreData.xcscheme → ...areddata/xcschemes/macOSCoreData.xcscheme b/...areddata/xcschemes/macOSCoreData.xcscheme → ...areddata/xcschemes/macOSCoreData.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4B71D7DD97B00ACBC3A"
                BuildableName = "SugarRecordCoreData.framework"
                BlueprintName = "macOSCoreData"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4B71D7DD97B00ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "macOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4B71D7DD97B00ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "macOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...cshareddata/xcschemes/macOSRealm.xcscheme → ...cshareddata/xcschemes/macOSRealm.xcscheme b/...cshareddata/xcschemes/macOSRealm.xcscheme → ...cshareddata/xcschemes/macOSRealm.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4DE1D7DDAEF00ACBC3A"
                BuildableName = "SugarRecordRealm.framework"
                BlueprintName = "macOSRealm"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4DE1D7DDAEF00ACBC3A"
             BuildableName = "SugarRecordRealm.framework"
             BlueprintName = "macOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4DE1D7DDAEF00ACBC3A"
             BuildableName = "SugarRecordRealm.framework"
             BlueprintName = "macOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...hareddata/xcschemes/tvOSCoreData.xcscheme → ...hareddata/xcschemes/tvOSCoreData.xcscheme b/...hareddata/xcschemes/tvOSCoreData.xcscheme → ...hareddata/xcschemes/tvOSCoreData.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4AA1D7DD95C00ACBC3A"
                BuildableName = "SugarRecordCoreData.framework"
                BlueprintName = "tvOSCoreData"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4AA1D7DD95C00ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "tvOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4AA1D7DD95C00ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "tvOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...xcshareddata/xcschemes/tvOSRealm.xcscheme → ...xcshareddata/xcschemes/tvOSRealm.xcscheme b/...xcshareddata/xcschemes/tvOSRealm.xcscheme → ...xcshareddata/xcschemes/tvOSRealm.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4D41D7DDA9900ACBC3A"
                BuildableName = "SugarRecordRealm.framework"
                BlueprintName = "tvOSRealm"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4D41D7DDA9900ACBC3A"
             BuildableName = "SugarRecordRealm.framework"
             BlueprintName = "tvOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4D41D7DDA9900ACBC3A"
             BuildableName = "SugarRecordRealm.framework"
             BlueprintName = "tvOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...eddata/xcschemes/watchOSCoreData.xcscheme → ...eddata/xcschemes/watchOSCoreData.xcscheme b/...eddata/xcschemes/watchOSCoreData.xcscheme → ...eddata/xcschemes/watchOSCoreData.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C49D1D7DD93600ACBC3A"
                BuildableName = "SugarRecordCoreData.framework"
                BlueprintName = "watchOSCoreData"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C49D1D7DD93600ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "watchOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C49D1D7DD93600ACBC3A"
             BuildableName = "SugarRecordCoreData.framework"
             BlueprintName = "watchOSCoreData"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/...hareddata/xcschemes/watchOSRealm.xcscheme → ...hareddata/xcschemes/watchOSRealm.xcscheme b/...hareddata/xcschemes/watchOSRealm.xcscheme → ...hareddata/xcschemes/watchOSRealm.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "2334C4CA1D7DDA4F00ACBC3A"
                BuildableName = "SugarRecordRealm.framework"
                BlueprintName = "watchOSRealm"
-               ReferencedContainer = "container:SugarRecord.xcodeproj">
+               ReferencedContainer = "container:Carthage.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -48,7 +48,7 @@
             BlueprintIdentifier = "2334C4CA1D7DDA4F00ACBC3A"
             BuildableName = "SugarRecordRealm.framework"
             BlueprintName = "watchOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -66,7 +66,7 @@
             BlueprintIdentifier = "2334C4CA1D7DDA4F00ACBC3A"
             BuildableName = "SugarRecordRealm.framework"
             BlueprintName = "watchOSRealm"
-            ReferencedContainer = "container:SugarRecord.xcodeproj">
+            ReferencedContainer = "container:Carthage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>