From 14ed9c736c373119bbeeeadcc6292e1d4cbb2768 Mon Sep 17 00:00:00 2001 From: Nikita Ogorodnikov Date: Thu, 2 May 2024 10:19:45 +0200 Subject: [PATCH] Use Gradle 8.7 and AGP 8.4.0 for the buildscript --- .gitlab-ci.yml | 2 +- Dockerfile.gitlab | 2 +- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f18e3991..1b2ed3fe 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab index c6df2920..9391274d 100644 --- a/Dockerfile.gitlab +++ b/Dockerfile.gitlab @@ -24,7 +24,7 @@ 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1f4f7457..318a8da1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ json = "20180813" okHttp = "4.12.0" # Android -androidToolsPlugin = "8.3.2" +androidToolsPlugin = "8.4.0" # AndroidX androidx-core ="1.3.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ea3535d..e7646dea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME