From 8ba7f061c68fc594a8e51bb843966e7bc73cdd4a Mon Sep 17 00:00:00 2001
From: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
Date: Thu, 16 Jan 2025 11:05:02 +0200
Subject: [PATCH] Minor copyright and CI update

- update and fix FV pipes
- updatecopyright in readme
- update CI due to recent macOS runner changes

Relates-To: MINOR

Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
---
 .github/workflows/psv_pipelines.yml           | 20 +++++--------------
 README.md                                     |  2 +-
 scripts/android/build-test-emulator.sh        |  4 ++--
 .../fv/gh-actions-functional-network-test.sh  |  6 +++---
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/psv_pipelines.yml b/.github/workflows/psv_pipelines.yml
index 251ef6db0..cf0a61215 100644
--- a/.github/workflows/psv_pipelines.yml
+++ b/.github/workflows/psv_pipelines.yml
@@ -186,17 +186,7 @@ jobs:
       run: scripts/macos/psv/azure_macos_build_psv.sh
       shell: bash
 
-  psv-macos-13-xcode-15-build:
-    name: PSV.MacOS13.Xcode15
-    runs-on: macos-13-xlarge
-    steps:
-    - name: Check out repository
-      uses: actions/checkout@v4
-    - name: MacOS Build Xcode15
-      run: scripts/macos/psv/azure_macos_build_psv.sh
-      shell: bash
-
-  psv-macos-14-xcode-15-build:
+  psv-macos-14-arm64-xcode-15-build:
     name: PSV.MacOS14.Xcode15
     runs-on: macos-14
     steps:
@@ -216,7 +206,7 @@ jobs:
       run: scripts/macos/psv/azure_macos_build_psv.sh
       shell: bash
 
-  psv-ios-xcode-15-build:
+  psv-ios-x86_64-xcode-15-build:
     name: PSV.iOS.MacOS13.Xcode15
     runs-on: macOS-13
     steps:
@@ -226,7 +216,7 @@ jobs:
       run: scripts/ios/azure_ios_build_psv.sh
       shell: bash
 
-  psv-ios-xcode-14-build:
+  psv-ios-x86_64-xcode-14-build:
     name: PSV.iOS.MacOS13.Xcode14
     runs-on: macOS-13
     steps:
@@ -238,7 +228,7 @@ jobs:
         env:
           USE_LATEST_XCODE: 0
 
-  psv-ios-os15-xcode-16-build:
+  psv-ios-os15-arm64-xcode-16-build:
     name: PSV.iOS.MacOS13.Xcode16
     runs-on: macOS-15
     steps:
@@ -248,7 +238,7 @@ jobs:
       run: scripts/ios/azure_ios_build_psv.sh
       shell: bash
 
-  psv-ios-os14-xcode-15-build:
+  psv-ios-os14-arm64-xcode-15-build:
     name: PSV.iOS.MacOS14.Xcode15
     runs-on: macOS-14
     steps:
diff --git a/README.md b/README.md
index 059137801..6e4ebf78d 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ For details, see <a href="https://github.com/heremaps/here-data-sdk-cpp/blob/mas
 
 ## LICENSE
 
-Copyright (C) 2019–2024 HERE Europe B.V.
+Copyright (C) 2019–2025 HERE Europe B.V.
 
 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.
 
diff --git a/scripts/android/build-test-emulator.sh b/scripts/android/build-test-emulator.sh
index 916fc88fa..2d269aac2 100755
--- a/scripts/android/build-test-emulator.sh
+++ b/scripts/android/build-test-emulator.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright (C) 2020-2024 HERE Europe B.V.
+# Copyright (C) 2020-2025 HERE Europe B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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
 echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI"
 
 # Create emulator
-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
+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
 echo "AVD created"
 emulator -list-avds
 
diff --git a/scripts/ios/fv/gh-actions-functional-network-test.sh b/scripts/ios/fv/gh-actions-functional-network-test.sh
index 08160d8cb..7d39a1248 100755
--- a/scripts/ios/fv/gh-actions-functional-network-test.sh
+++ b/scripts/ios/fv/gh-actions-functional-network-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 #
-# Copyright (C) 2021-2024 HERE Europe B.V.
+# Copyright (C) 2021-2025 HERE Europe B.V.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -96,14 +96,14 @@ xcrun simctl list
 xcrun simctl list devices
 xcrun simctl list runtimes
 
-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)
+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)
 
 # Create new Simulator device
 
 xcrun simctl list devices | grep ${CurrentDeviceUDID}
 xcrun simctl boot ${CurrentDeviceUDID} || true
 xcrun simctl list devices | grep ${CurrentDeviceUDID}
-xcrun simctl create ${GITHUB_RUN_ID}_iphone14 "com.apple.CoreSimulator.SimDeviceType.iPhone-14"
+xcrun simctl create ${GITHUB_RUN_ID}_iphone15 "com.apple.CoreSimulator.SimDeviceType.iPhone-15"
 xcrun simctl list devices | grep ${CurrentDeviceUDID}
 echo "Simulator created"