Merge pull request #253 from DataDog/nogorodnikov/update-gradle-agp-v…

…ersions

Update Gradle to 8.7, AGP to 8.4.0

.github/workflows/codeql-analysis.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          gradle-version: 8.6
+          gradle-version: 8.7
 
       # Manually build the java bytecode
       - name: Execute Gradle build

.gitlab-ci.yml

@@ -4,7 +4,7 @@ include:
 # SETUP
 
 variables:
-  CURRENT_CI_IMAGE: "7"
+  CURRENT_CI_IMAGE: "8"
   CI_IMAGE_DOCKER: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/dd-sdk-android-gradle-plugin:$CURRENT_CI_IMAGE
   GIT_DEPTH: 5
 

CONTRIBUTING.md

@@ -27,9 +27,6 @@ The whole project is covered by a set of static analysis tools, linters and test
 # launches the unit tests
 ./gradlew :dd-sdk-android-gradle-plugin:test
 
-# launches the detekt static analysis
-./gradlew :dd-sdk-android-gradle-plugin:detekt
-
 # launches the ktlint check and formatter for all Kotlin files (the ktlint client needs to be installed on your machine)
 ktlint -F "**/*.kt" "**/*.kts" '!**/build/generated/**' '!**/build/kspCaches/**'
 

Dockerfile.gitlab

@@ -24,11 +24,11 @@ RUN set -x \
  && apt-get -y clean \
  && rm -rf /var/lib/apt/lists/*
 
-ENV GRADLE_VERSION 8.6
+ENV GRADLE_VERSION 8.7
 ENV ANDROID_COMPILE_SDK 34
 ENV ANDROID_BUILD_TOOLS 34.0.0
 ENV ANDROID_SDK_TOOLS 11076708
-ENV NDK_VERSION 25.1.8937393
+ENV NDK_VERSION 26.1.10909125
 ENV CMAKE_VERSION 3.22.1
 
 

buildSrc/build.gradle.kts

@@ -31,7 +31,6 @@ dependencies {
 
     // Dependencies used to configure the gradle plugins
     implementation(embeddedKotlin("gradle-plugin"))
-    implementation(libs.detektPluginGradle)
     implementation(libs.androidToolsPluginGradle)
     implementation(libs.versionsPluginGradle)
     implementation(libs.fuzzyWuzzy)

dd-sdk-android-gradle-plugin/build.gradle.kts

@@ -6,7 +6,6 @@
 
 import com.datadog.gradle.config.MavenConfig
 import com.datadog.gradle.config.dependencyUpdateConfig
-import com.datadog.gradle.config.detektConfig
 import com.datadog.gradle.config.jacocoConfig
 import com.datadog.gradle.config.javadocConfig
 import com.datadog.gradle.config.junitConfig
@@ -26,7 +25,6 @@ plugins {
 
     // Analysis tools
     id("com.github.ben-manes.versions")
-    id("io.gitlab.arturbosch.detekt")
 
     // Tests
     jacoco
@@ -48,11 +46,9 @@ dependencies {
     testImplementation(libs.okHttpMock)
     testImplementation(libs.androidToolsPluginGradle)
     testImplementation(libs.kotlinPluginGradle)
-    detekt(libs.detektCli)
 }
 
 kotlinConfig()
-detektConfig()
 junitConfig()
 jacocoConfig()
 javadocConfig()

dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt

@@ -1346,8 +1346,8 @@ internal class DdAndroidGradlePluginFunctionalTest {
             }
         """.trimIndent()
 
-        const val LATEST_GRADLE_VERSION = "8.6"
-        const val LATEST_AGP_VERSION = "8.3.2"
+        const val LATEST_GRADLE_VERSION = "8.7"
+        const val LATEST_AGP_VERSION = "8.4.0"
 
         // NB: starting from AGP 7.x, Gradle should have the same major version.
         // While work with Gradle with higher major version is possible, it is not guaranteed.