Skip to content

Commit f7fffa7

Browse files
authored
Merge pull request #3089 from DataDog/nogorodnikov/update-gradle-agp-311225
Update Gradle version to 8.14.3, AGP version to 8.13.2
2 parents 24b5d98 + 366c898 commit f7fffa7

File tree

8 files changed

+17
-12
lines changed

8 files changed

+17
-12
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: Setup Gradle
5050
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
5151
with:
52-
gradle-version: 8.11.1
52+
gradle-version: 8.14.3
5353

5454
# Manually build the java bytecode
5555
- name: Execute Gradle build

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
CURRENT_CI_IMAGE: "22"
2+
CURRENT_CI_IMAGE: "23"
33
CI_IMAGE_DOCKER: registry.ddbuild.io/ci/dd-sdk-android:$CURRENT_CI_IMAGE
44
GIT_DEPTH: 5
55

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ nexusPublishing {
6464
}
6565
}
6666

67-
task<Delete>("clean") {
67+
tasks.register<Delete>("clean") {
6868
delete(rootProject.layout.buildDirectory)
6969
}
7070

buildSrc/src/main/kotlin/com/datadog/gradle/config/AndroidConfig.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,16 @@ fun Project.androidLibraryConfig() {
7070
checkReleaseBuilds = false
7171
checkGeneratedSources = true
7272
ignoreTestSources = true
73-
disable.addAll(
74-
listOf(
75-
"UseKtx" // https://googlesamples.github.io/android-custom-lint-rules/checks/UseKtx.md.html
76-
)
73+
val disabledChecks = listOf(
74+
// https://googlesamples.github.io/android-custom-lint-rules/checks/AndroidGradlePluginVersion.md.html
75+
"AndroidGradlePluginVersion",
76+
// https://googlesamples.github.io/android-custom-lint-rules/checks/GradleDependency.md.html
77+
"GradleDependency",
78+
// https://googlesamples.github.io/android-custom-lint-rules/checks/Aligned16KB.md.html
79+
"Aligned16KB",
80+
"UseKtx" // https://googlesamples.github.io/android-custom-lint-rules/checks/UseKtx.md.html
7781
)
82+
disable.addAll(disabledChecks)
7883
}
7984

8085
packaging {

ci/Dockerfile.gitlab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ RUN set -x \
2626
&& apt-get -y clean \
2727
&& rm -rf /var/lib/apt/lists/*
2828

29-
ENV GRADLE_VERSION 8.11.1
29+
ENV GRADLE_VERSION 8.14.3
3030
ENV ANDROID_COMPILE_SDK 36
3131
ENV ANDROID_BUILD_TOOLS 36.0.0
32-
ENV ANDROID_SDK_TOOLS 11076708
32+
ENV ANDROID_SDK_TOOLS 13114758
3333
ENV NDK_VERSION 28.0.13004108
3434
ENV CMAKE_VERSION 3.22.1
3535
ENV DD_TRACER_VERSION 1.54.0

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ okHttp = "4.12.0"
1313
# Android
1414
adapterDelegates = "4.3.2"
1515
androidDesugaringSdk = "2.0.4"
16-
androidToolsPlugin = "8.9.1"
16+
androidToolsPlugin = "8.13.2"
1717
androidXAnnotations = "1.9.1"
1818
androidXAppCompat = "1.4.2" # Next version will bring coroutines
1919
androidXCar = "1.4.0"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

sample/benchmark/transitiveDependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ androidx.core:core-ktx:1.12.0 : 169 Kb
3838
androidx.core:core:1.12.0 : 1291 Kb
3939
androidx.cursoradapter:cursoradapter:1.0.0 : 10 Kb
4040
androidx.customview:customview:1.1.0 : 32 Kb
41-
androidx.databinding:viewbinding:8.9.1 : 1860 b
41+
androidx.databinding:viewbinding:8.13.2 : 1860 b
4242
androidx.documentfile:documentfile:1.0.0 : 10 Kb
4343
androidx.drawerlayout:drawerlayout:1.0.0 : 31 Kb
4444
androidx.dynamicanimation:dynamicanimation:1.0.0 : 31 Kb

0 commit comments

Comments
 (0)