Commit Graph

3 Commits

Author SHA1 Message Date
Alexandru Croitor
4dab0e5514 Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Amends 7e2882d0a7

Augments d59825d250

Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6e7de2b76c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 18:31:42 +00:00
Heikki Halmet
283a46b54f Provisioning: bump Android platform sdk and build tools version to 31
Use latest platform and build tools with macOS 12

Change-Id: If3021f8f727c1775ad14b16897c7e9db3ea08ad1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 249603dc4f)
2021-11-21 11:46:55 +02:00
Ville-Pekka Karhu
39b34476c7 Provisioning: Add macOS Monterey (12) x86 to CI
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7e2882d0a7)
2021-11-17 17:43:00 +02:00