Skip to content

Commit

Permalink
Remove temporary workaround for 180889192
Browse files Browse the repository at this point in the history
  • Loading branch information
tnorbye committed Mar 16, 2021
1 parent c4819bd commit 9452c02
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -7,8 +7,8 @@ buildscript {
//lintVersion = '27.2.0-beta05'

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

repositories {
Expand Down
14 changes: 1 addition & 13 deletions checks/build.gradle
Expand Up @@ -13,25 +13,13 @@ lintOptions {
dependencies {
// For a description of the below dependencies, see the main project README
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
// You typically don't need this one:
compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

// TEMPORARY WORKAROUND
// Due to https://issuetracker.google.com/180889192, for some builds
// of 7.0 you may need to add one or more of the following dependencies,
// depending on which APIs your lint checks depend on. These were accidentally
// not exported by the lint-api artifact as api dependencies. This will
// be fixed by AGP 7.0.0-alpha10.
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
compileOnly "com.android.tools.layoutlib:layoutlib-api:$lintVersion"
compileOnly "com.android.tools:common:$lintVersion"
compileOnly "com.android.tools.external.com-intellij:kotlin-compiler:$lintVersion"
compileOnly "org.ow2.asm:asm:7.0"

testImplementation "junit:junit:4.13.2"
testImplementation "com.android.tools.lint:lint:$lintVersion"
testImplementation "com.android.tools.lint:lint-tests:$lintVersion"
testImplementation "com.android.tools:testutils:$lintVersion"
}

sourceCompatibility = "1.8"
Expand Down

0 comments on commit 9452c02

Please sign in to comment.