Skip to content

Commit f7e8486

Browse files
committed
Android SDK build
1 parent 0d2a8d5 commit f7e8486

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

swift-ci/sdks/android/scripts/fetch-source.sh

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ usage: fetch-source.sh [--swift-scheme <scheme>|--swift-tag <tag>
4040
|--swift-version <version>]
4141
[--curl-version <version>]
4242
[--boringssl-version <version>]
43-
[--zlib-version <version>]
4443
[--clone-with-ssh]
4544
[--source-dir <path>]
4645
@@ -60,8 +59,6 @@ SDK for Swift. Options are:
6059
--libxml2-version <version>
6160
--curl-version <version>
6261
--boringssl-version <version>
63-
--zlib-version <version>
64-
Select the versions of other dependencies.
6562
EOF
6663
}
6764

@@ -70,17 +67,14 @@ if [[ -z "${SWIFT_VERSION}" ]]; then
7067
SWIFT_VERSION=scheme:release/6.1
7168
fi
7269
if [[ -z "${LIBXML2_VERSION}" ]]; then
73-
LIBXML2_VERSION=2.12.7
70+
LIBXML2_VERSION=2.14.2
7471
fi
7572
if [[ -z "${CURL_VERSION}" ]]; then
76-
CURL_VERSION=8.7.1
73+
CURL_VERSION=8.13.0
7774
fi
7875
if [[ -z "${BORINGSSL_VERSION}" ]]; then
7976
BORINGSSL_VERSION=fips-20220613
8077
fi
81-
if [[ -z "${ZLIB_VERSION}" ]]; then
82-
ZLIB_VERSION=1.3.1
83-
fi
8478

8579
clone_with_ssh=false
8680
while [ "$#" -gt 0 ]; do
@@ -97,8 +91,6 @@ while [ "$#" -gt 0 ]; do
9791
CURL_VERSION="$2"; shift ;;
9892
--boringssl-version)
9993
BORINGSSL_VERSION="$2"; shift ;;
100-
--zlib-version)
101-
ZLIB_VERSION="$2"; shift ;;
10294
--clone-with-ssh)
10395
clone_with_ssh=true ;;
10496
--source-dir)
@@ -164,18 +156,11 @@ pushd curl >/dev/null 2>&1
164156
git checkout curl-$(echo ${CURL_VERSION} | tr '.' '_')
165157
popd >/dev/null 2>&1
166158

167-
# Fetch BoringSSL (also can't clone using ssh)
159+
# Fetch BoringSSL
168160
header "Fetching BoringSSL"
169161

170162
[[ -d boringssl ]] || git clone https://boringssl.googlesource.com/boringssl
171163
pushd boringssl >/dev/null 2>&1
172164
git checkout ${BORINGSSL_VERSION}
173165
popd >/dev/null 2>&1
174166

175-
# Fetch zlib
176-
header "Fetching zlib"
177-
178-
[[ -d zlib ]] || git clone ${github}madler/zlib.git
179-
pushd zlib >/dev/null 2>&1
180-
git checkout v${ZLIB_VERSION}
181-
popd >/dev/null 2>&1

0 commit comments

Comments
 (0)