Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RUMM-2477: Update Cmake to 3.22.1 #1032

Merged
merged 1 commit into from
Sep 5, 2022
Merged

RUMM-2477: Update Cmake to 3.22.1 #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Dockerfile.gitlab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ ENV ANDROID_COMPILE_SDK 31
ENV ANDROID_BUILD_TOOLS 31.0.0
ENV ANDROID_SDK_TOOLS 7583922
ENV NDK_VERSION 22.1.7171670
ENV CMAKE_VERSION 3.10.2.4988404
ENV CMAKE_VERSION 3.22.1
# Docker image is shared between branches and some older versions (1.14 and below) need to have CMAKE 3.10
# Can be removed at some point
ENV CMAKE_VERSION_LEGACY 3.10.2.4988404



Expand Down Expand Up @@ -70,6 +73,7 @@ RUN \
echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null && \
echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --install "ndk;${NDK_VERSION}" >/dev/null && \
echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --install "cmake;${CMAKE_VERSION}" >/dev/null && \
echo y | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --install "cmake;${CMAKE_VERSION_LEGACY}" >/dev/null && \
yes | android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses

RUN set -x \
Expand Down
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/com/datadog/gradle/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ object Dependencies {

// NDK
const val Ndk = "22.1.7171670"
// TODO RUMM-1660. Check if Cmake >= 3.20.4 is available when doing AGP 7 migration
// Cannot use 3.18.1 here, because it has a bug in the File API.
const val CMake = "3.10.2"
const val CMake = "3.22.1"
}

object Repositories {
Expand Down
2 changes: 1 addition & 1 deletion dd-sdk-android-ndk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project("dd-sdk-android-ndk")
cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.22.1)
# use the C++ 17 compiler
set(CMAKE_CXX_STANDARD 17)
add_subdirectory(src/main/cpp)
Expand Down
2 changes: 1 addition & 1 deletion instrumented/nightly-tests/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project("datadog-nightly-tests")
cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.22.1)

add_library( # Sets the name of the library.
datadog-nightly-lib
Expand Down
2 changes: 1 addition & 1 deletion sample/kotlin/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project("datadog-native-sample")
cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.22.1)

add_library( # Sets the name of the library.
datadog-native-sample-lib
Expand Down
5 changes: 0 additions & 5 deletions sample/kotlin/src/main/kotlin/com/datadog/android/sample/crash/CrashFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ class CrashFragment :
viewModel = ViewModelProviders.of(this).get(CrashViewModel::class.java)
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
triggerCrash()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this crash mechanism no longer needed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not when the view is created, we have buttons in the sample app ui to trigger different crashes (JVM, native,…)

}

// endregion

// region View.OnClickListener
Expand Down