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

RUMM-3487: Update AGP to 8.1.0 #182

Merged
merged 1 commit into from
Jul 28, 2023
Merged

RUMM-3487: Update AGP to 8.1.0 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions ...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 @@ -24,6 +24,7 @@ import org.junit.jupiter.api.extension.ExtendWith
import org.junit.jupiter.api.extension.Extensions
import org.junit.jupiter.api.io.TempDir
import java.io.File
import java.util.Locale
import java.util.Properties
import kotlin.io.path.Path

Expand Down Expand Up @@ -64,7 +65,7 @@ internal class DdAndroidGradlePluginFunctionalTest {
private lateinit var datadogCiFile: File

@BeforeEach
fun `set up`() {
fun `set up`(forge: Forge) {
appRootDir = File(testProjectDir, "samples/app").apply { mkdirs() }
libModuleRootDir = File(testProjectDir, "samples/lib-module").apply { mkdirs() }
settingsFile = File(testProjectDir, "settings.gradle")
Expand All @@ -81,7 +82,10 @@ internal class DdAndroidGradlePluginFunctionalTest {
libModulePlaceholderFile = File(libModuleKotlinSourcesDir, "Placeholder.kt")
datadogCiFile = File(testProjectDir.parent, "datadog-ci.json")

stubFile(settingsFile, SETTINGS_FILE_CONTENT)
// we need to check that our plugin supports different AGP versions (backward and forward
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't you need a test for each better ?

// compatible)
val agpVersion = forge.anElementFrom(OLD_AGP_VERSION, LATEST_AGP_VERSION)
stubFile(settingsFile, SETTINGS_FILE_CONTENT.format(Locale.US, agpVersion))
stubFile(sampleApplicationClassFile, APPLICATION_CLASS_CONTENT)
stubFile(appManifestFile, APP_MANIFEST_FILE_CONTENT)
stubFile(gradlePropertiesFile, GRADLE_PROPERTIES_FILE_CONTENT)
Expand Down Expand Up @@ -802,7 +806,7 @@ internal class DdAndroidGradlePluginFunctionalTest {
resolutionStrategy {
eachPlugin {
if (requested.id.id == "com.android.application") {
useModule("com.android.tools.build:gradle:7.1.2")
useModule("com.android.tools.build:gradle:%s")
}
if (requested.id.id == "kotlin-android") {
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
Expand All @@ -822,5 +826,8 @@ internal class DdAndroidGradlePluginFunctionalTest {
org.gradle.jvmargs=-Xmx2560m
android.useAndroidX=true
""".trimIndent()

const val OLD_AGP_VERSION = "7.1.2"
const val LATEST_AGP_VERSION = "8.1.0"
}
}
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
Expand Up @@ -5,7 +5,7 @@ json = "20180813"
okHttp = "4.11.0"

# Android
androidToolsPlugin = "8.0.1"
androidToolsPlugin = "8.1.0"

# AndroidX
androidx-core ="1.3.2"
Expand Down