Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gradle 7.5 & Kotlin 1.6.10 #103

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Gradle 7.5 & Kotlin 1.6.10 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
416b25d
Gradle 7.5
0xnm Jul 27, 2022
77ae3fb
Kotlin 1.6.10
0xnm Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.gitlab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...e-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,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")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# Commons
kotlin = "1.5.21"
kotlin = "1.6.10"
json = "20180813"
okHttp = "4.9.3"

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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