[release/1.4.0] Update carthage-project.yml specifying the version of…

… Swift to be used. Generate the Carthage project
tuist · Nov 17, 2017 · e971dc9 · e971dc9
1 parent 1d8e69d
commit e971dc9
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 58 deletions.
diff --git a/Carthage.xcodeproj/project.pbxproj b/Carthage.xcodeproj/project.pbxproj
@@ -533,6 +533,7 @@
 				PRODUCT_NAME = xcproj;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -562,6 +563,7 @@
 				PRODUCT_NAME = xcproj;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -590,6 +592,7 @@
 				PRODUCT_NAME = xcproj;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
@@ -619,6 +622,7 @@
 				PRODUCT_NAME = xcproj;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};

diff --git a/Carthage.xcodeproj/xcshareddata/xcschemes/xcproj_iOS.xcscheme b/Carthage.xcodeproj/xcshareddata/xcschemes/xcproj_iOS.xcscheme
@@ -1,28 +1,93 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Scheme LastUpgradeVersion="0900" version="1.3">
-	<AnalyzeAction buildConfiguration="Debug" />
-	<ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES" />
-	<TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug">
-		<Testables />
-		<MacroExpansion>
-			<BuildableReference BlueprintIdentifier="NT4163490801" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_iOS.framework" BlueprintName="xcproj_iOS" BuildableIdentifier="primary" />
-		</MacroExpansion>
-	</TestAction>
-	<ProfileAction savedToolIdentifier="" useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES">
-		<BuildableProductRunnable runnableDebuggingMode="0">
-			<BuildableReference BlueprintIdentifier="NT4163490801" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_iOS.framework" BlueprintName="xcproj_iOS" BuildableIdentifier="primary" />
-		</BuildableProductRunnable>
-	</ProfileAction>
-	<BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES">
-		<BuildActionEntries>
-			<BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForProfiling="YES" buildForAnalyzing="YES">
-				<BuildableReference BlueprintIdentifier="NT4163490801" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_iOS.framework" BlueprintName="xcproj_iOS" BuildableIdentifier="primary" />
-			</BuildActionEntry>
-		</BuildActionEntries>
-	</BuildAction>
-	<LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES">
-		<BuildableProductRunnable runnableDebuggingMode="0">
-			<BuildableReference BlueprintIdentifier="NT4163490801" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_iOS.framework" BlueprintName="xcproj_iOS" BuildableIdentifier="primary" />
-		</BuildableProductRunnable>
-	</LaunchAction>
-</Scheme>
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0900"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "NT4163490801"
+               BuildableName = "xcproj.framework"
+               BlueprintName = "xcproj_iOS"
+               ReferencedContainer = "container:Carthage.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "NT4163490801"
+            BuildableName = "xcproj.framework"
+            BlueprintName = "xcproj_iOS"
+            ReferencedContainer = "container:Carthage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "NT4163490801"
+            BuildableName = "xcproj.framework"
+            BlueprintName = "xcproj_iOS"
+            ReferencedContainer = "container:Carthage.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "NT4163490801"
+            BuildableName = "xcproj.framework"
+            BlueprintName = "xcproj_iOS"
+            ReferencedContainer = "container:Carthage.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Carthage.xcodeproj/xcshareddata/xcschemes/xcproj_macOS.xcscheme b/Carthage.xcodeproj/xcshareddata/xcschemes/xcproj_macOS.xcscheme
@@ -1,28 +1,93 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Scheme LastUpgradeVersion="0900" version="1.3">
-	<AnalyzeAction buildConfiguration="Debug" />
-	<ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES" />
-	<TestAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Debug">
-		<Testables />
-		<MacroExpansion>
-			<BuildableReference BlueprintIdentifier="NT5099916101" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_macOS.framework" BlueprintName="xcproj_macOS" BuildableIdentifier="primary" />
-		</MacroExpansion>
-	</TestAction>
-	<ProfileAction savedToolIdentifier="" useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" buildConfiguration="Release" debugDocumentVersioning="YES">
-		<BuildableProductRunnable runnableDebuggingMode="0">
-			<BuildableReference BlueprintIdentifier="NT5099916101" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_macOS.framework" BlueprintName="xcproj_macOS" BuildableIdentifier="primary" />
-		</BuildableProductRunnable>
-	</ProfileAction>
-	<BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES">
-		<BuildActionEntries>
-			<BuildActionEntry buildForArchiving="YES" buildForTesting="YES" buildForRunning="YES" buildForProfiling="YES" buildForAnalyzing="YES">
-				<BuildableReference BlueprintIdentifier="NT5099916101" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_macOS.framework" BlueprintName="xcproj_macOS" BuildableIdentifier="primary" />
-			</BuildActionEntry>
-		</BuildActionEntries>
-	</BuildAction>
-	<LaunchAction selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle="0" buildConfiguration="Debug" debugServiceExtension="internal" ignoresPersistentStateOnLaunch="NO" useCustomWorkingDirectory="NO" allowLocationSimulation="YES" debugDocumentVersioning="YES">
-		<BuildableProductRunnable runnableDebuggingMode="0">
-			<BuildableReference BlueprintIdentifier="NT5099916101" ReferencedContainer="container:Carthage.xcodeproj" BuildableName="xcproj_macOS.framework" BlueprintName="xcproj_macOS" BuildableIdentifier="primary" />
-		</BuildableProductRunnable>
-	</LaunchAction>
-</Scheme>
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0900"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "NT5099916101"
+               BuildableName = "xcproj.framework"
+               BlueprintName = "xcproj_macOS"
+               ReferencedContainer = "container:Carthage.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "NT5099916101"
+            BuildableName = "xcproj.framework"
+            BlueprintName = "xcproj_macOS"
+            ReferencedContainer = "container:Carthage.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "NT5099916101"
+            BuildableName = "xcproj.framework"
+            BlueprintName = "xcproj_macOS"
+            ReferencedContainer = "container:Carthage.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "NT5099916101"
+            BuildableName = "xcproj.framework"
+            BlueprintName = "xcproj_macOS"
+            ReferencedContainer = "container:Carthage.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CocoaPods/Podfile.lock b/CocoaPods/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
   - AEXML (4.1.0)
   - PathKit (0.8.0)
-  - xcproj (1.2.0):
+  - xcproj (1.3.0):
     - AEXML (~> 4.1)
     - PathKit (~> 0.8)
 
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AEXML: 647fbb051280f3fb38a1a7caa62b0344055a851c
   PathKit: dcab05d701474011aae0e40cf892298a831f63d6
-  xcproj: b184f84f708d84bab63638903974ca95ebeffb0b
+  xcproj: 4805b0774910518a560974847d0b8e5b60a71dae
 
 PODFILE CHECKSUM: 2b8bfbb70dcc013e3ca2bf6ce7085024138065fe
 

diff --git a/carthage-project.yml b/carthage-project.yml
@@ -7,6 +7,7 @@ targets:
     scheme: {}
     settings:
       PRODUCT_BUNDLE_IDENTIFIER: swift.xcode.xcproj
+      SWIFT_VERSION: 4.0
     dependencies:
       - carthage: PathKit
       - carthage: AEXML