Remove all uses of our homebrew jetifier plugin.
Note: this disables SupportLeanbackJank from building
until we can migrate to AGP that supports jetifier.
Bug: 74817223
Test: None
Change-Id: Ib47221bd854b978e2bb3145491592c3cff053432
diff --git a/build.gradle b/build.gradle
index 03b1de7..c731c92 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,6 @@
classpath build_libs.gradle
classpath build_libs.lint
classpath build_libs.jacoco
- classpath build_libs.jetifier
classpath build_libs.kotlin.gradle_plugin
}
}
diff --git a/buildSrc/build_dependencies.gradle b/buildSrc/build_dependencies.gradle
index ac7c501..4e23e62 100644
--- a/buildSrc/build_dependencies.gradle
+++ b/buildSrc/build_dependencies.gradle
@@ -45,7 +45,6 @@
build_libs.error_prone_gradle = 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.13'
build_libs.jacoco = 'org.jacoco:org.jacoco.core:0.7.8'
build_libs.jacoco_ant = 'org.jacoco:org.jacoco.ant:0.7.8'
-build_libs.jetifier = 'com.android.support.jetifier:jetifier-gradle-plugin:0.2.0'
build_libs.kotlin = [
gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${build_versions.kotlin}"
]
diff --git a/car/build.gradle b/car/build.gradle
index b37d958..7cd9e53 100644
--- a/car/build.gradle
+++ b/car/build.gradle
@@ -4,7 +4,6 @@
plugins {
id("SupportAndroidLibraryPlugin")
- id("androidx.tools.jetifier")
}
dependencies {
diff --git a/samples/SupportDesignDemos/build.gradle b/samples/SupportDesignDemos/build.gradle
index c66d97e..fd52797 100644
--- a/samples/SupportDesignDemos/build.gradle
+++ b/samples/SupportDesignDemos/build.gradle
@@ -4,7 +4,6 @@
plugins {
id("SupportAndroidTestAppPlugin")
- id("androidx.tools.jetifier")
id("kotlin-android")
}
diff --git a/samples/SupportLeanbackJank/build.gradle b/samples/SupportLeanbackJank/build.gradle
index 43ed95d6..199e545 100644
--- a/samples/SupportLeanbackJank/build.gradle
+++ b/samples/SupportLeanbackJank/build.gradle
@@ -1,10 +1,9 @@
plugins {
id("SupportAndroidTestAppPlugin")
- id("androidx.tools.jetifier")
}
dependencies {
- implementation(jetifier.process('com.github.bumptech.glide:glide:3.6.1'))
+ implementation('com.github.bumptech.glide:glide:3.6.1')
implementation(project(":leanback"))
implementation(project(":leanback-preference"))
}
diff --git a/settings.gradle b/settings.gradle
index 45ee7aa..9633842 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -119,7 +119,7 @@
includeProject(":support-design-demos", new File(samplesRoot, "SupportDesignDemos"))
includeProject(":support-emoji-demos", new File(samplesRoot, "SupportEmojiDemos"))
includeProject(":support-leanback-demos", new File(samplesRoot, "SupportLeanbackDemos"))
-includeProject(":support-leanback-jank", new File(samplesRoot, "SupportLeanbackJank"))
+//includeProject(":support-leanback-jank", new File(samplesRoot, "SupportLeanbackJank"))
includeProject(":support-percent-demos", new File(samplesRoot, "SupportPercentDemos"))
includeProject(":support-preference-demos", new File(samplesRoot, "SupportPreferenceDemos"))
includeProject(":support-slices-demos", new File(samplesRoot, "SupportSliceDemos"))
