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

Jump to bottom

Upgrade AGP to 7 #4133

Merged
merged 5 commits into from Jan 15, 2022
Merged

Upgrade AGP to 7 #4133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11dccfc
Upgrade AGP to 7.0.4
chao2zhang Sep 28, 2021
d808b60
Merge remote-tracking branch 'origin/main' into agp7
chao2zhang Dec 28, 2021
dbf5b1f
Run Android tests on JDK 11 and above only
3flex Jan 15, 2022
f966b6c
Skip Android report merging test if Android requirements unmet
3flex Jan 15, 2022
0543130
Update skip reason
chao2zhang Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt
View file
Open in desktop
Expand Up @@ -370,7 +370,7 @@ internal fun isAndroidSdkInstalled() =

internal fun skipIfAndroidEnvironmentRequirementsUnmet() = when {
!isAndroidSdkInstalled() -> Skip.Yes("No android SDK.")
getJdkVersion() >= 16 -> Skip.Yes("Android 4.1.3 & 4.2.1 don't run on JDK 16 or higher")
getJdkVersion() < 11 -> Skip.Yes("Android Gradle Plugin 7.0+ requires JDK 11 or newer")
else -> Skip.No
}

Expand Down
6 changes: 5 additions & 1 deletion detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@ package io.gitlab.arturbosch.detekt.report

import io.gitlab.arturbosch.detekt.getJdkVersion
import io.gitlab.arturbosch.detekt.manifestContent
import io.gitlab.arturbosch.detekt.skipIfAndroidEnvironmentRequirementsUnmet
import io.gitlab.arturbosch.detekt.testkit.DslGradleRunner
import io.gitlab.arturbosch.detekt.testkit.DslTestBuilder
import io.gitlab.arturbosch.detekt.testkit.ProjectLayout
Expand Down Expand Up @@ -85,7 +86,10 @@ class ReportMergeSpec : Spek({
}
}

it("for android detekt") {
it(
"for android detekt",
skip = skipIfAndroidEnvironmentRequirementsUnmet()
) {
val builder = DslTestBuilder.groovy()
val projectLayout = ProjectLayout(0).apply {
addSubmodule(
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", versio
kotlinx-html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3"
kotlinx-coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"

android-gradle = "com.android.tools.build:gradle:4.2.2"
android-gradle = "com.android.tools.build:gradle:7.0.4"

ktlint-core = { module = "com.pinterest.ktlint:ktlint-core", version.ref = "ktlint" }
ktlint-rulesetStandard = { module = "com.pinterest.ktlint:ktlint-ruleset-standard", version.ref = "ktlint" }
Expand Down