Skip to content

Commit af791c6

Browse files
committed
Minor docs and deps refresh
- update recommended curl and openssl versions - update and fix FV pipes - update readme - update CI due to recent macOS runenr changes Relates-To: MINOR Signed-off-by: Yaroslav Stefinko <[email protected]>
1 parent 94e6d9d commit af791c6

File tree

5 files changed

+23
-33
lines changed

5 files changed

+23
-33
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,7 @@ jobs:
186186
run: scripts/macos/psv/azure_macos_build_psv.sh
187187
shell: bash
188188

189-
psv-macos-13-xcode-15-build:
190-
name: PSV.MacOS13.Xcode15
191-
runs-on: macos-13-xlarge
192-
steps:
193-
- name: Check out repository
194-
uses: actions/checkout@v4
195-
- name: MacOS Build Xcode15
196-
run: scripts/macos/psv/azure_macos_build_psv.sh
197-
shell: bash
198-
199-
psv-macos-14-xcode-15-build:
189+
psv-macos-14-arm64-xcode-15-build:
200190
name: PSV.MacOS14.Xcode15
201191
runs-on: macos-14
202192
steps:
@@ -216,7 +206,7 @@ jobs:
216206
run: scripts/macos/psv/azure_macos_build_psv.sh
217207
shell: bash
218208

219-
psv-ios-xcode-15-build:
209+
psv-ios-x86_64-xcode-15-build:
220210
name: PSV.iOS.MacOS13.Xcode15
221211
runs-on: macOS-13
222212
steps:
@@ -226,7 +216,7 @@ jobs:
226216
run: scripts/ios/azure_ios_build_psv.sh
227217
shell: bash
228218

229-
psv-ios-xcode-14-build:
219+
psv-ios-x86_64-xcode-14-build:
230220
name: PSV.iOS.MacOS13.Xcode14
231221
runs-on: macOS-13
232222
steps:
@@ -238,7 +228,7 @@ jobs:
238228
env:
239229
USE_LATEST_XCODE: 0
240230

241-
psv-ios-os15-xcode-16-build:
231+
psv-ios-os15-arm64-xcode-16-build:
242232
name: PSV.iOS.MacOS13.Xcode16
243233
runs-on: macOS-15
244234
steps:
@@ -248,7 +238,7 @@ jobs:
248238
run: scripts/ios/azure_ios_build_psv.sh
249239
shell: bash
250240

251-
psv-ios-os14-xcode-15-build:
241+
psv-ios-os14-arm64-xcode-15-build:
252242
name: PSV.iOS.MacOS14.Xcode15
253243
runs-on: macOS-14
254244
steps:

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ The table below lists the platforms on which the Data SDK has been tested.
6565

6666
The table below lists the dependencies of the Data SDK.
6767

68-
| Library | Recommended version |
69-
|:---------------------|:--------------------|
70-
| Libcurl | 7.52.1 |
71-
| OpenSSL | 1.1.1w |
72-
| Boost (headers only) | 1.82.0 |
73-
| LevelDB | 1.21 |
74-
| Snappy | 1.1.7 |
75-
| RapidJSON | latest |
76-
| Zlib | 1.3.1 |
68+
| Library | Minimal version |
69+
|:---------------------|:----------------|
70+
| Libcurl | 7.83.1 |
71+
| OpenSSL | 3.1.4 |
72+
| Boost (headers only) | 1.82.0 |
73+
| LevelDB | 1.21 |
74+
| Snappy | 1.1.7 |
75+
| RapidJSON | latest |
76+
| Zlib | 1.3.1 |
7777

7878
### Linux dependencies
7979

@@ -92,7 +92,7 @@ For details, see <a href="https://github.com/heremaps/here-data-sdk-cpp/blob/mas
9292

9393
## LICENSE
9494

95-
Copyright (C) 2019–2024 HERE Europe B.V.
95+
Copyright (C) 2019–2025 HERE Europe B.V.
9696

9797
For license details, see the <a href="https://github.com/heremaps/here-data-sdk-cpp/blob/master/LICENSE" target="_blank">LICENSE</a> file in the root of this project.
9898

external/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2019-2024 HERE Europe B.V.
1+
# Copyright (C) 2019-2025 HERE Europe B.V.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -61,10 +61,10 @@ set(OLP_SDK_CPP_ZLIB_URL "https://www.zlib.net/zlib-1.3.1.tar.gz")
6161
set(OLP_SDK_CPP_ZLIB_HASH "SHA256=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23")
6262

6363
set(OLP_SDK_CPP_OPENSSL_URL "https://github.com/openssl/openssl.git")
64-
set(OLP_SDK_CPP_OPENSSL_TAG "OpenSSL_1_1_1w")
64+
set(OLP_SDK_CPP_OPENSSL_TAG "openssl-3.1.4")
6565

6666
set(OLP_SDK_CPP_CURL_URL "https://github.com/bagder/curl.git")
67-
set(OLP_SDK_CPP_CURL_TAG "curl-7_52_1")
67+
set(OLP_SDK_CPP_CURL_TAG "curl-7_83_1")
6868

6969
# Add external projects
7070
find_package(GTest QUIET)

scripts/android/build-test-emulator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (C) 2020-2024 HERE Europe B.V.
3+
# Copyright (C) 2020-2025 HERE Europe B.V.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -73,7 +73,7 @@ echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "emulator" "p
7373
echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI"
7474

7575
# Create emulator
76-
echo "no" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager create avd -n android_emulator -k "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" --force
76+
echo "yes" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager create avd -n android_emulator -k "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" --force
7777
echo "AVD created"
7878
emulator -list-avds
7979

scripts/ios/fv/gh-actions-functional-network-test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (C) 2021-2024 HERE Europe B.V.
3+
# Copyright (C) 2021-2025 HERE Europe B.V.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -96,14 +96,14 @@ xcrun simctl list
9696
xcrun simctl list devices
9797
xcrun simctl list runtimes
9898

99-
export CurrentDeviceUDID=$(xcrun simctl list devices | grep "iPhone 14 (" | grep -v "unavailable" | grep -v "com.apple.CoreSimulator.SimDeviceType" | cut -d'(' -f2 | cut -d')' -f1 | head -1)
99+
export CurrentDeviceUDID=$(xcrun simctl list devices | grep "iPhone 15 (" | grep -v "unavailable" | grep -v "com.apple.CoreSimulator.SimDeviceType" | cut -d'(' -f2 | cut -d')' -f1 | head -1)
100100

101101
# Create new Simulator device
102102

103103
xcrun simctl list devices | grep ${CurrentDeviceUDID}
104104
xcrun simctl boot ${CurrentDeviceUDID} || true
105105
xcrun simctl list devices | grep ${CurrentDeviceUDID}
106-
xcrun simctl create ${GITHUB_RUN_ID}_iphone14 "com.apple.CoreSimulator.SimDeviceType.iPhone-14"
106+
xcrun simctl create ${GITHUB_RUN_ID}_iphone15 "com.apple.CoreSimulator.SimDeviceType.iPhone-15"
107107
xcrun simctl list devices | grep ${CurrentDeviceUDID}
108108
echo "Simulator created"
109109

0 commit comments

Comments
 (0)