Merge pull request #121 from vgorloff/develop

RC [1.0.70] - 2021-06-08

Author: vgorloff

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.70] - 2021-06-08
+* #118 Updated to use Swift 5.4.1
+
 ## [1.0.69] - 2021-05-12
 * #113 Updated to use Swift 5.4
 

VERSION

@@ -1 +1 @@
-1.0.69
+1.0.70

lib/Builders/SPMBuilder.js

@@ -67,9 +67,8 @@ module.exports = class SPMBuilder extends Builder {
   }
 
   configurePatches(/** @type {Boolean} */ shouldEnable) {
+    this.configurePatch(`${this.paths.patches}/Sources/Build/BuildPlan.swift.diff`, shouldEnable)
     //> Below not needed starting from v1.0.69. See also option `USE_CMAKE_INSTALL`
-    // this.configurePatch(`${this.paths.patches}/Sources/Build/BuildPlan.swift.diff`, shouldEnable)
-    //
     // this.configurePatch(`${this.paths.patches}/Sources/Build/CMakeLists.txt.diff`, shouldEnable)
     // this.configurePatch(`${this.paths.patches}/Sources/Commands/CMakeLists.txt.diff`, shouldEnable)
     // this.configurePatch(`${this.paths.patches}/Sources/LLBuildManifest/CMakeLists.txt.diff`, shouldEnable)

lib/Git/Revision.js

@@ -26,12 +26,13 @@
 
 module.exports = {
 
+  // 1.0.70 - 5cfadf128e58cd0bff99d09b17eb05fa39311e95 - tag:swift-5.4.1-RELEASE @ Mon May 17 09:16:50 2021 -0700
   // 1.0.68 - 3e4fab9bb6a56fc30d43e72eaff5b096cf160c55 - tag:swift-5.4-RELEASE @ Apr 24 22:11:07 2021 -0700
   // 1.0.66 - a51d2fefc70a41cf765853739c5037c182bdaad9 - tag:swift-5.3.3-RELEASE @ 25. January 2021 at 10:31:21 CET
   // 1.0.62 - 253ea65ba72933c92850803f0c26aa768757b3ab - tag:swift-5.3.1-RELEASE @ 12. November 2020 at 09:17:14 CET
   // 1.0.56 - e7c2f897ad2766b1664b56f3a77d939b844dd135 - tag:swift-5.3-RELEASE @ 11. September 2020 at 03:51:47 CEST
   // 1.0.54 - 443e9a41d1a7c1fcae280490144fcbf8461d3499 - tag:swift-5.2-RELEASE @ 24. March 2020 at 19:15:32 CET
-  swift: "3e4fab9bb6a56fc30d43e72eaff5b096cf160c55",
+  swift: "5cfadf128e58cd0bff99d09b17eb05fa39311e95",
 
   // 1.0.68 - f13ea5dcc055e5d2d7c02e90d8c9907ca9dc72e1 - tag:swift-5.4-RELEASE @ Aug 14 14:49:59 2020 -0700
   // 1.0.62 - 25ea083a3af4ca09eee2b6dbdf58f1b163f87008 - tag:swift-5.3.1-RELEASE @ 2. September 2020 at 09:28:48 CEST
@@ -47,11 +48,13 @@ module.exports = {
   // 1.0.54 - 8d0871530c52456278ef8c83cb049e6d70b28a6b - tag:swift-5.2-RELEASE @ 18. March 2020 at 08:25:12 CET
   foundation: "b8c9b25e0bb50f4118f5bd9e53c14a8fa3fcf240",
 
+  // 1.0.70 - cf0195a2f45d22e5e4487152f78fc077e5100dae - tag:swift-5.4.1-RELEASE @ Thu May 6 14:48:03 2021 -0700
   // 1.0.67 - 439a44695a0534a26557cc34b4fe650dccb46aed - tag:swift-5.4-RELEASE @ 13. April 2021 at 19:37:22 CEST
   // 1.0.62 - 3093af41dd65ad466dcd5603e9289244edfee4f5 - tag:swift-5.3.1-RELEASE @ 21. October 2020 at 01:10:23 CEST
   // 1.0.56 - c39a810ec308dd4a8d93c5011fb73a5c987e8680 - tag:swift-5.3-RELEASE @ 10. September 2020 at 08:07:01 CEST
-  llvm: "439a44695a0534a26557cc34b4fe650dccb46aed",
+  llvm: "cf0195a2f45d22e5e4487152f78fc077e5100dae",
 
+  // 1.0.70 - 9c8096a23f44794bde297452d87c455fc4f76d42 - tag:swift-5.4.1-RELEASE @ Mon May 4 10:27:35 2020 -0700
   // 1.0.68 - 9c8096a23f44794bde297452d87c455fc4f76d42 - tag:swift-5.4-RELEASE @ 4. May 2020 at 19:27:35 CEST
   // 1.0.62 - 1168665f6b36be747ffe6b7b90bc54cfc17f42b7 - tag:swift-5.3.1-RELEASE @ 27. January 2020 at 22:00:52 CET
   // 1.0.56 - 1168665f6b36be747ffe6b7b90bc54cfc17f42b7 - tag:swift-5.3-RELEASE @ 27. January 2020 at 22:00:52 CET
@@ -71,11 +74,12 @@ module.exports = {
   // 1.0.26 - f8a8c1f59db355b46962577e7b74f1a1e8149dc6 - tag:v2.9.9 @ 3. January 2019 at 19:14:17 CET
   xml: "f8a8c1f59db355b46962577e7b74f1a1e8149dc6",
 
+  // 1.0.70 - 374cdb42d7b146837de70489a04c5df956092685 - tag:swift-5.4.1-RELEASE @ Fri May 14 13:05:34 2021 -0700
   // 1.0.68 - 7cd58d6cc1945b14db1346792b39af609ce17fe9 - tag:swift-5.4-RELEASE @ Apr 24 21:40:37 2021 -0700
   // 1.0.66 - 06d96d033ffdcbf97b741ed79d62127c4fe419b3 - tag:swift-5.3.3-RELEASE @ 6. January 2021 at 19:38:25 CET
   // 1.0.62 - 2bec212061295719620c7f4cf2d2e257a95aab39 - tag:swift-5.3.1-RELEASE @ 21. September 2020 at 23:23:26 CEST
   // 1.0.56 - 91bdc78dbd4595e69a45654d1e80eb334e1977c4 - tag:swift-5.3-RELEASE @ 10. September 2020 at 19:12:36 CEST
-  spm: "7cd58d6cc1945b14db1346792b39af609ce17fe9",
+  spm: "374cdb42d7b146837de70489a04c5df956092685",
 
   // 1.0.68 - eb56a00ed9dfd62c2ce4ec86183ff0bc0afda997 - tag:swift-5.4-RELEASE @ 14. December 2020 at 23:36:23 CET
   // 1.0.62 - ef2e9ba657fd0a4e6e25fff05051b328bf27aeaf - tag:swift-5.3.1-RELEASE @ 10. September 2020 at 18:55:53 CEST
@@ -86,11 +90,13 @@ module.exports = {
   // 1.0.57 - 8c3dfd42a36d0416345143eae4567d9314c12246 - branch:origin/release/5.3 @ 16. September 2020 at 21:54:27 CEST
   tsc: "e95add83fc1042a0a0e260d342f9fc5608df9a84",
 
+  // 1.0.70 - 986d191f94cec88f6350056da59c2e59e83d1229 - tag:0.4.3
   // 1.0.69 - 831ed5e860a70e745bc1337830af4786b2576881 - tag:0.4.1
-  sap: "831ed5e860a70e745bc1337830af4786b2576881",
+  sap: "986d191f94cec88f6350056da59c2e59e83d1229",
 
+  // 1.0.70 - 9ff1cc9327586db4e0c8f46f064b6a82ec1566fa - tag:4.0.6
   // 1.0.69 - 81a65c4069c28011ee432f2858ba0de49b086677 - tag:3.0.1
-  yams: "81a65c4069c28011ee432f2858ba0de49b086677",
+  yams: "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
 
   // 1.0.69 - 93e8b927225a62b963ebe13ab11e04192fa8a67b - tag:swift-5.4-RELEASE
   sd: "93e8b927225a62b963ebe13ab11e04192fa8a67b"

lib/Installer.js

@@ -68,6 +68,7 @@ module.exports = class Installer extends Tool {
   makeSymbolicLinks() {
     var libDirPath = path.join(Config.toolChainBuildOutput, "usr", "lib");
     this.execute(`cd "${libDirPath}" && ln -svf ./swift/macosx/libArgumentParser.dylib `);
+    this.execute(`cd "${libDirPath}" && ln -svf ./swift/macosx/libYams.dylib `);
   }
 
   copyToolchainFiles() {