Merge pull request swiftlang#143 from apple/add-swift-experimental-string-processing-repo-main

[main] Add support for swift-experimental-string-processing repo

Author: shahmishal

platforms/Linux/DEB/Shared/build_source_package.sh

@@ -122,6 +122,7 @@ get_component swift-nio-ssl https://github.com/apple/swift-nio-ssl/archive/${swi
 get_component swift-format https://github.com/apple/swift-format/archive/swift-${swift_version}.tar.gz
 get_component swift-lmdb https://github.com/apple/swift-lmdb/archive/swift-${swift_version}.tar.gz
 get_component swift-markdown https://github.com/apple/swift-markdown/archive/swift-${swift_version}.tar.gz
+get_component swift-experimental-string-processing https://github.com/apple/swift-experimental-string-processing/archive/swift-${swift_version}.tar.gz
 
 # Refresh patches, if any
 if [ -s swiftlang-${debversion}/debian/patches/series ]; then

platforms/Linux/DEB/Shared/versions.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-debversion=5.6.3
+debversion=5.7.0
 
-swift_version=5.6.3-RELEASE
+swift_version=5.7-RELEASE
 icu_version=65-1
 yams_version=4.0.2
 swift_argument_parser_version=1.0.3

platforms/Linux/DEB/Ubuntu/focal/debian/control.in

@@ -33,7 +33,7 @@ Architecture: amd64 arm64
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libc6-dev, libcurl4-openssl-dev, libgcc-9-dev, libstdc++-9-dev, libxml2-dev,
  libz3-dev, uuid-dev, zlib1g-dev,
- binutils, git, pkg-config, tzdata,
+ binutils, git, pkg-config, tzdata, unzip
  python3
 Description: Swift programming language, release x.y.z
  Swift is a general-purpose programming language built using

platforms/Linux/RPM/Amazonlinux/2/swiftlang.spec

@@ -35,6 +35,7 @@ Source30:       https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_v
 Source31:       https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
 Source32:       https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
 Source33:       https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
+Source34:       https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz
 
 Patch0:         patches/hwasan_symbolize.patch
 
@@ -81,14 +82,15 @@ Requires:       libxml2-devel
 Requires:       sqlite
 Requires:       tar
 Requires:       tzdata
+Requires:       unzip
 
 ExclusiveArch:  x86_64 aarch64
 
 %description
 %include description.inc
 
 %prep
-%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
+%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -127,6 +129,7 @@ mv swift-system-%{swift_system_version} swift-system
 mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
 mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
 mv Yams-%{yams_version} yams
+mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing
 
 # Adjust python version hwasan_symbolize
 %patch0 -p1

platforms/Linux/RPM/Centos/7/swiftlang.spec

@@ -35,6 +35,7 @@ Source30:       https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_v
 Source31:       https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
 Source32:       https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
 Source33:       https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
+Source34:       https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz
 
 Patch0:         patches/hwasan_symbolize.patch
 
@@ -83,14 +84,15 @@ Requires:       pkgconfig
 Requires:       python3
 Requires:       sqlite
 Requires:       zlib-devel
+Requires:       unzip
 
 ExclusiveArch:  x86_64 aarch64
 
 %description
 %include description.inc
 
 %prep
-%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
+%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -129,6 +131,7 @@ mv swift-system-%{swift_system_version} swift-system
 mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
 mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
 mv Yams-%{yams_version} yams
+mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing
 
 # Adjust python version hwasan_symbolize
 %patch0 -p1

platforms/Linux/RPM/Fedora/34/swiftlang.spec

@@ -35,6 +35,7 @@ Source30:       https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_v
 Source31:       https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
 Source32:       https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
 Source33:       https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
+Source34:       https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz
 
 Patch0:         nocyclades.patch
 Patch1:         unusedvariable.patch
@@ -73,7 +74,7 @@ ExclusiveArch:  x86_64 aarch64
 %include description.inc
 
 %prep
-%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
+%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -112,6 +113,7 @@ mv swift-system-%{swift_system_version} swift-system
 mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
 mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
 mv Yams-%{yams_version} yams
+mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing
 
 # Remove Cyclades as it has been removed from the Linux kernel
 %patch0 -p0

platforms/Linux/RPM/Fedora/35/swiftlang.spec

@@ -35,6 +35,7 @@ Source30:       https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_v
 Source31:       https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
 Source32:       https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
 Source33:       https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
+Source34:       https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz
 
 Patch0:         nocyclades.patch
 Patch1:         unusedvariable.patch
@@ -73,7 +74,7 @@ ExclusiveArch:  x86_64 aarch64
 %include description.inc
 
 %prep
-%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
+%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -112,6 +113,7 @@ mv swift-system-%{swift_system_version} swift-system
 mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
 mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
 mv Yams-%{yams_version} yams
+mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing
 
 # Remove Cyclades as it has been removed from the Linux kernel
 %patch0 -p0

platforms/Linux/RPM/Fedora/rawhide/swiftlang.spec

@@ -35,6 +35,7 @@ Source30:       https://github.com/apple/swift-nio-ssl/archive/%{swift_nio_ssl_v
 Source31:       https://github.com/apple/swift-format/archive/swift-%{swift_version}.tar.gz#/swift-format.tar.gz
 Source32:       https://github.com/apple/swift-lmdb/archive/swift-%{swift_version}.tar.gz#/swift-lmdb.tar.gz
 Source33:       https://github.com/apple/swift-markdown/archive/swift-%{swift_version}.tar.gz#/swift-markdown.tar.gz
+Source34:       https://github.com/apple/swift-experimental-string-processing/archive/swift-%{swift_version}.tar.gz#/swift-experimental-string-processing.tar.gz
 
 Patch0:         nocyclades.patch
 Patch1:         unusedvariable.patch
@@ -73,7 +74,7 @@ ExclusiveArch:  x86_64 aarch64
 %include description.inc
 
 %prep
-%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33
+%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
@@ -112,6 +113,7 @@ mv swift-system-%{swift_system_version} swift-system
 mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
 mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
 mv Yams-%{yams_version} yams
+mv swift-experimental-string-processing-swift-%{swift_version} swift-experimental-string-processing
 
 # Remove Cyclades as it has been removed from the Linux kernel
 %patch0 -p0

platforms/Linux/RPM/Shared/metadata/global.inc

@@ -1,7 +1,7 @@
 # versions
 
-%global package_version 5.6.3
-%global swift_version 5.6.3-RELEASE
+%global package_version 5.7.0
+%global swift_version 5.7-RELEASE
 
 %global cmake_version 3.19.6
 %global icu_version 65-1