Carthage

OskarGroth · Oct 19, 2016 · 4139fda · 4139fda
1 parent 7ac9319
commit 4139fda
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/FlatButton.xcodeproj/project.pbxproj b/FlatButton.xcodeproj/project.pbxproj
@@ -9,8 +9,6 @@
 /* Begin PBXBuildFile section */
 		75670D831DB7A6BF00F6EA18 /* FlatButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 75670D811DB7A6BF00F6EA18 /* FlatButton.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		75670D871DB7A6C900F6EA18 /* FlatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75935E3A1D534DD90069AF86 /* FlatButton.swift */; };
-		75670D881DB7A74800F6EA18 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 75935E341D534A1A0069AF86 /* Info.plist */; };
-		75670D891DB7A74A00F6EA18 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 75670D821DB7A6BF00F6EA18 /* Info.plist */; };
 		75820B261D5A5B2400B98872 /* close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 75820B251D5A5B2400B98872 /* close@2x.png */; };
 		75935E2E1D534A1A0069AF86 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75935E2D1D534A1A0069AF86 /* AppDelegate.swift */; };
 		75935E331D534A1A0069AF86 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 75935E311D534A1A0069AF86 /* MainMenu.xib */; };
@@ -183,7 +181,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				75670D891DB7A74A00F6EA18 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -193,7 +190,6 @@
 			files = (
 				75935E331D534A1A0069AF86 /* MainMenu.xib in Resources */,
 				75820B261D5A5B2400B98872 /* close@2x.png in Resources */,
-				75670D881DB7A74800F6EA18 /* Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -409,6 +405,7 @@
 				75670D861DB7A6BF00F6EA18 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		75935E251D534A1A0069AF86 /* Build configuration list for PBXProject "FlatButton" */ = {
 			isa = XCConfigurationList;

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/Oskar.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/Oskar.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FlatButton.xcodeproj/xcshareddata/xcschemes/FlatButton.xcscheme b/FlatButton.xcodeproj/xcshareddata/xcschemes/FlatButton.xcscheme
@@ -29,6 +29,15 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "75935E291D534A1A0069AF86"
+            BuildableName = "FlatButton-Example.app"
+            BlueprintName = "FlatButton-Example"
+            ReferencedContainer = "container:FlatButton.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -42,15 +51,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "75670D7E1DB7A6BF00F6EA18"
-            BuildableName = "FlatButton.framework"
-            BlueprintName = "FlatButton"
-            ReferencedContainer = "container:FlatButton.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

diff --git a/FlatButton.xcodeproj/xcuserdata/Oskar.xcuserdatad/xcschemes/xcschememanagement.plist b/FlatButton.xcodeproj/xcuserdata/Oskar.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>FlatButton-Example.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>FlatButton.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>