From 13fea6521c14abc7ae01e5c5243e9e28722e5299 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Wed, 7 Feb 2024 15:10:17 +1100 Subject: [PATCH] Update the cmake version to be a minimum value --- .drone.jsonnet | 3 ++- libsession-util/build.gradle | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 058af85a8a..5fc89893fc 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -6,7 +6,8 @@ local version_info = { image: docker_base + 'android', commands: [ 'cmake --version', - '/usr/lib/android-sdk/tools/bin/sdkmanager --list | awk "/Installed/{flag=1; next} /Available/{flag=0} flag"' + 'apt-show-versions android-sdk', + 'apt-show-versions android-ndk' ] }; diff --git a/libsession-util/build.gradle b/libsession-util/build.gradle index 935227185f..f368f15eea 100644 --- a/libsession-util/build.gradle +++ b/libsession-util/build.gradle @@ -26,7 +26,7 @@ android { externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt" - version "3.22.1" + version "3.22.1+" } } compileOptions {