RUM-6069 Update the build system and CI to target API 35

DataDog · Sep 19, 2024 · 5a8be07 · 5a8be07
1 parent cf9e60b
commit 5a8be07
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ include:
 # SETUP
 
 variables:
-  CURRENT_CI_IMAGE: "10"
+  CURRENT_CI_IMAGE: "11"
   CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 

diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
@@ -26,8 +26,8 @@ RUN set -x \
  && rm -rf /var/lib/apt/lists/*
 
 ENV GRADLE_VERSION 8.9
-ENV ANDROID_COMPILE_SDK 34
-ENV ANDROID_BUILD_TOOLS 34.0.0
+ENV ANDROID_COMPILE_SDK 35
+ENV ANDROID_BUILD_TOOLS 35.0.0
 ENV ANDROID_SDK_TOOLS 11076708
 ENV NDK_VERSION 25.1.8937393
 ENV CMAKE_VERSION 3.22.1

diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt
@@ -15,10 +15,10 @@ import org.gradle.api.Project
 
 object AndroidConfig {
 
-    const val TARGET_SDK = 34
+    const val TARGET_SDK = 35
     const val MIN_SDK = 21
     const val MIN_SDK_FOR_WEAR = 23
-    const val BUILD_TOOLS_VERSION = "34.0.0"
+    const val BUILD_TOOLS_VERSION = "35.0.0"
 
     val VERSION = Version(2, 14, 0, Version.Type.Snapshot)
 }