Merge pull request #103 from DataDog/nogorodnikov/gradle-7.5-kotlin-1.6

Gradle 7.5 & Kotlin 1.6.10
DataDog · Aug 22, 2022 · 7912597 · 7912597
2 parents e13be0d + 77ae3fb
commit 7912597
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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/...e-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt b/...e-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
@@ -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
diff --git 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