diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab index 8c2dc310..35360a02 100644 --- a/Dockerfile.gitlab +++ b/Dockerfile.gitlab @@ -1,4 +1,4 @@ -FROM registry.ddbuild.io/images/mirror/ubuntu:18.04 +FROM registry.ddbuild.io/images/mirror/ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive @@ -24,7 +24,7 @@ RUN set -x \ && apt-get -y clean \ && rm -rf /var/lib/apt/lists/* -ENV GRADLE_VERSION 7.2 +ENV GRADLE_VERSION 7.5 ENV ANDROID_COMPILE_SDK 31 ENV ANDROID_BUILD_TOOLS 31.0.0 ENV ANDROID_SDK_TOOLS 7583922 diff --git a/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt b/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt index 889fcfb2..1577a3eb 100644 --- a/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt +++ b/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt @@ -765,7 +765,7 @@ internal class DdAndroidGradlePluginFunctionalTest { useModule("com.android.tools.build:gradle:7.1.2") } if (requested.id.id == "kotlin-android") { - useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21") + useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1151210..63d11009 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Commons -kotlin = "1.5.21" +kotlin = "1.6.10" json = "20180813" okHttp = "4.9.3" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..41d9927a 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2453542..224e1962 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -6,6 +6,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists