Skip to content

Commit 9452c02

Browse files
committed
Remove temporary workaround for 180889192
1 parent c4819bd commit 9452c02

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
//lintVersion = '27.2.0-beta05'
88

99
// Upcoming lint target: Arctic Fox / AGP 7
10-
gradlePluginVersion = '7.0.0-alpha08'
11-
lintVersion = '30.0.0-alpha08' // if gradle plugin was 4.1.2, you'd use 27.1.2 here
10+
gradlePluginVersion = '7.0.0-alpha10'
11+
lintVersion = '30.0.0-alpha10' // if gradle plugin was 4.1.2, you'd use 27.1.2 here
1212
}
1313

1414
repositories {

checks/build.gradle

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,13 @@ lintOptions {
1313
dependencies {
1414
// For a description of the below dependencies, see the main project README
1515
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
16+
// You typically don't need this one:
1617
compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
1718
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
1819

19-
// TEMPORARY WORKAROUND
20-
// Due to https://issuetracker.google.com/180889192, for some builds
21-
// of 7.0 you may need to add one or more of the following dependencies,
22-
// depending on which APIs your lint checks depend on. These were accidentally
23-
// not exported by the lint-api artifact as api dependencies. This will
24-
// be fixed by AGP 7.0.0-alpha10.
25-
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
26-
compileOnly "com.android.tools.layoutlib:layoutlib-api:$lintVersion"
27-
compileOnly "com.android.tools:common:$lintVersion"
28-
compileOnly "com.android.tools.external.com-intellij:kotlin-compiler:$lintVersion"
29-
compileOnly "org.ow2.asm:asm:7.0"
30-
3120
testImplementation "junit:junit:4.13.2"
3221
testImplementation "com.android.tools.lint:lint:$lintVersion"
3322
testImplementation "com.android.tools.lint:lint-tests:$lintVersion"
34-
testImplementation "com.android.tools:testutils:$lintVersion"
3523
}
3624

3725
sourceCompatibility = "1.8"

0 commit comments

Comments
 (0)