Design rules fixes.
+ Added fallback rule when dejetifying new media classes.
+ androidx.car to ignore for dejetification
+ Replaced set with list for rules - because order matters.
+ Set 2.0.0 versions for arch components.
Bug: b/64833662
Test: N/A
Change-Id: If87ae7037bd08e77c4e5991a94b98f811e884c82
diff --git a/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/config/Config.kt b/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/config/Config.kt
index e9414bb..043fe38 100644
--- a/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/config/Config.kt
+++ b/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/config/Config.kt
@@ -39,7 +39,7 @@
data class Config(
val restrictToPackagePrefixes: Set<String>,
val rulesMap: RewriteRulesMap,
- val slRules: Set<RewriteRule>,
+ val slRules: List<RewriteRule>,
val pomRewriteRules: Set<PomRewriteRule>,
val typesMap: TypesMap,
val proGuardMap: ProGuardTypesMap,
@@ -67,7 +67,7 @@
val EMPTY = Config(
restrictToPackagePrefixes = emptySet(),
rulesMap = RewriteRulesMap.EMPTY,
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = emptySet(),
typesMap = TypesMap.EMPTY,
proGuardMap = ProGuardTypesMap.EMPTY,
@@ -120,8 +120,8 @@
return Config(
restrictToPackagePrefixes = restrictToPackages.filterNotNull().toSet(),
rulesMap = RewriteRulesMap(
- rules?.filterNotNull()?.map { it.toRule() }?.toSet() ?: emptySet()),
- slRules = slRules?.filterNotNull()?.map { it.toRule() }?.toSet() ?: emptySet(),
+ rules?.filterNotNull()?.map { it.toRule() }?.toList() ?: emptyList()),
+ slRules = slRules?.filterNotNull()?.map { it.toRule() }?.toList() ?: emptyList(),
pomRewriteRules = pomRules.filterNotNull().map { it.toRule() }.toSet(),
typesMap = mappings?.toMappings() ?: TypesMap.EMPTY,
proGuardMap = proGuardMap?.toMappings() ?: ProGuardTypesMap.EMPTY
diff --git a/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/rule/RewriteRulesMap.kt b/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/rule/RewriteRulesMap.kt
index daf5b97..1310021 100644
--- a/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/rule/RewriteRulesMap.kt
+++ b/jetifier/jetifier/core/src/main/kotlin/com/android/tools/build/jetifier/core/rule/RewriteRulesMap.kt
@@ -21,15 +21,15 @@
/**
* Contains all [RewriteRule]s.
*/
-class RewriteRulesMap(val rewriteRules: Set<RewriteRule>) {
+class RewriteRulesMap(val rewriteRules: List<RewriteRule>) {
companion object {
private const val TAG = "RewriteRulesMap"
- val EMPTY = RewriteRulesMap(emptySet())
+ val EMPTY = RewriteRulesMap(emptyList())
}
- constructor(vararg rules: RewriteRule) : this(rules.toSet())
+ constructor(vararg rules: RewriteRule) : this(rules.toList())
val runtimeIgnoreRules = rewriteRules.filter { it.isRuntimeIgnoreRule() }.toSet()
@@ -56,10 +56,10 @@
return RewriteRulesMap(rewriteRules
.filter { !it.isIgnoreRule() }
.map { it.reverse() }
- .toSet())
+ .toList())
}
- fun appendRules(rules: Set<RewriteRule>): RewriteRulesMap {
+ fun appendRules(rules: List<RewriteRule>): RewriteRulesMap {
return RewriteRulesMap(rewriteRules + rules)
}
diff --git a/jetifier/jetifier/core/src/main/resources/default.config b/jetifier/jetifier/core/src/main/resources/default.config
index 35a625e..37812a7 100644
--- a/jetifier/jetifier/core/src/main/resources/default.config
+++ b/jetifier/jetifier/core/src/main/resources/default.config
@@ -590,8 +590,8 @@
"to": "androidx/collection/SimpleArrayMap{0}"
},
{
- "from": "android/support/v4/util/SparseArrayCompat(.*)",
- "to": "androidx/collection/SparseArrayCompat{0}"
+ "from": "android/support/v4/util/SparseArray(.*)",
+ "to": "androidx/collection/SparseArray{0}"
},
{
"from": "android/support/v4/provider/DocumentFile(.*)",
@@ -678,215 +678,224 @@
"to": "androidx/multidex/{0}"
},
- # Design lib
+ # Design lib - temporary
{
- "from": "android/support/design/widget/AppBarLayout(.*)",
- "to": "com/google/android/material/appbar/AppBarLayout{0}"
- },
- {
- "from": "android/support/design/widget/BaseTransientBottomBar(.*)",
- "to": "com/google/android/material/snackbar/BaseTransientBottomBar{0}"
- },
- {
- "from": "android/support/design/widget/BottomNavigationView(.*)",
- "to": "com/google/android/material/bottomnavigation/BottomNavigationView{0}"
- },
- {
- "from": "android/support/design/widget/BottomSheet(.*)",
- "to": "com/google/android/material/bottomsheet/BottomSheet{0}"
- },
- {
- "from": "android/support/design/widget/CheckableImageButton(.*)",
- "to": "com/google/android/material/internal/CheckableImageButton{0}"
- },
- {
- "from": "android/support/design/widget/CircularBorderDrawable(.*)",
- "to": "com/google/android/material/internal/CircularBorderDrawable{0}"
- },
- {
- "from": "android/support/design/widget/CollapsingTextHelper(.*)",
- "to": "com/google/android/material/internal/CollapsingTextHelper{0}"
- },
- {
- "from": "android/support/design/widget/CollapsingToolbarLayout(.*)",
- "to": "com/google/android/material/appbar/CollapsingToolbarLayout{0}"
- },
- {
- "from": "android/support/design/widget/CutoutDrawable(.*)",
- "to": "com/google/android/material/textfield/CutoutDrawable{0}"
- },
- {
- "from": "android/support/design/widget/DescendantOffsetUtils(.*)",
- "to": "com/google/android/material/internal/DescendantOffsetUtils{0}"
- },
- {
- "from": "android/support/design/widget/DrawableUtils(.*)",
- "to": "com/google/android/material/internal/DrawableUtils{0}"
- },
- {
- "from": "android/support/design/widget/FloatingActionButton(.*)",
- "to": "com/google/android/material/floatingactionbutton/FloatingActionButton{0}"
- },
- {
- "from": "android/support/design/widget/HeaderBehavior(.*)",
- "to": "com/google/android/material/appbar/HeaderBehavior{0}"
- },
- {
- "from": "android/support/design/widget/HeaderScrollingViewBehavior(.*)",
- "to": "com/google/android/material/appbar/HeaderScrollingViewBehavior{0}"
- },
- {
- "from": "android/support/design/widget/HideBottomViewOnScrollBehavior(.*)",
- "to": "com/google/android/material/behavior/HeaderScrollingViewBehavior{0}"
- },
- {
- "from": "android/support/design/widget/IndicatorViewController(.*)",
- "to": "com/google/android/material/textfield/IndicatorViewController{0}"
- },
- {
- "from": "android/support/design/widget/MathUtils(.*)",
- "to": "com/google/android/material/math/MathUtils{0}"
- },
- {
- "from": "android/support/design/widget/NavigationView(.*)",
- "to": "com/google/android/material/navigation/NavigationView{0}"
- },
- {
- "from": "android/support/design/widget/Shadow(.*)",
- "to": "com/google/android/material/shadow/Shadow{0}"
- },
- {
- "from": "android/support/design/widget/Snackbar(.*)",
- "to": "com/google/android/material/snackbar/Snackbar{0}"
- },
- {
- "from": "android/support/design/widget/SnackbarManager(.*)",
- "to": "com/google/android/material/snackbar/SnackbarManager{0}"
- },
- {
- "from": "android/support/design/widget/StateListAnimator(.*)",
- "to": "com/google/android/material/internal/StateListAnimator{0}"
- },
- {
- "from": "android/support/design/widget/SwipeDismissBehavior(.*)",
- "to": "com/google/android/material/behavior/SwipeDismissBehavior{0}"
- },
- {
- "from": "android/support/design/widget/Tab(.*)",
- "to": "com/google/android/material/tabs/Tab{0}"
- },
- {
- "from": "android/support/design/widget/TextInput(.*)",
- "to": "com/google/android/material/textfield/TextInput{0}"
- },
- {
- "from": "android/support/design/widget/ViewOffsetBehavior(.*)",
- "to": "com/google/android/material/appbar/ViewOffsetBehavior{0}"
- },
- {
- "from": "android/support/design/widget/ViewOffsetHelper(.*)",
- "to": "com/google/android/material/appbar/ViewOffsetHelper{0}"
- },
- {
- "from": "android/support/design/widget/ViewUtilsLollipop(.*)",
- "to": "com/google/android/material/appbar/ViewUtilsLollipop{0}"
- },
- {
- "from": "android/support/design/widget/VisibilityAwareImageButton(.*)",
- "to": "com/google/android/material/internal/VisibilityAwareImageButton{0}"
- },
- {
- "from": "android/support/design/internal/BottomNavigation(.*)",
- "to": "com/google/android/material/bottomnavigation/BottomNavigation{0}"
- },
- {
- "from": "android/support/design/internal/SnackbarContentLayout(.*)",
- "to": "com/google/android/material/snackbar/SnackbarContentLayout{0}"
- },
- {
- "from": "android/support/design/animation/(.*)",
- "to": "com/google/android/material/animation/{0}"
- },
- {
- "from": "android/support/design/bottomappbar/(.*)",
- "to": "com/google/android/material/bottomappbar/{0}"
- },
- {
- "from": "android/support/design/bottomnavigation/(.*)",
- "to": "com/google/android/material/bottomnavigation/{0}"
- },
- {
- "from": "android/support/design/button/(.*)",
- "to": "com/google/android/material/button/{0}"
- },
- {
- "from": "android/support/design/canvas/(.*)",
- "to": "com/google/android/material/canvas/{0}"
- },
- {
- "from": "android/support/design/card/(.*)",
- "to": "com/google/android/material/card/{0}"
- },
- {
- "from": "android/support/design/chip/(.*)",
- "to": "com/google/android/material/chip/{0}"
- },
- {
- "from": "android/support/design/circularreveal/(.*)",
- "to": "com/google/android/material/circularreveal/{0}"
- },
- {
- "from": "android/support/design/circularreveal/cardview/(.*)",
- "to": "com/google/android/material/circularreveal/cardview/{0}"
- },
- {
- "from": "android/support/design/circularreveal/coordinatorlayout/(.*)",
- "to": "com/google/android/material/circularreveal/coordinatorlayout/{0}"
- },
- {
- "from": "android/support/design/drawable/(.*)",
- "to": "com/google/android/material/drawable/{0}"
- },
- {
- "from": "android/support/design/expandable/(.*)",
- "to": "com/google/android/material/expandable/{0}"
- },
- {
- "from": "android/support/design/internal/(.*)",
- "to": "com/google/android/material/internal/{0}"
- },
- {
- "from": "android/support/design/math/(.*)",
- "to": "com/google/android/material/math/{0}"
- },
- {
- "from": "android/support/design/resources/(.*)",
- "to": "com/google/android/material/resources/{0}"
- },
- {
- "from": "android/support/design/ripple/(.*)",
- "to": "com/google/android/material/ripple/{0}"
- },
- {
- "from": "android/support/design/shape/(.*)",
- "to": "com/google/android/material/shape/{0}"
- },
- {
- "from": "android/support/design/snackbar/(.*)",
- "to": "com/google/android/material/snackbar/{0}"
- },
- {
- "from": "android/support/design/stateful/(.*)",
- "to": "com/google/android/material/stateful/{0}"
- },
- {
- "from": "android/support/design/theme/(.*)",
- "to": "com/google/android/material/theme/{0}"
- },
- {
- "from": "android/support/design/transformation/(.*)",
- "to": "com/google/android/material/transformation/{0}"
+ "from": "android/support/design/(.*)",
+ "to": "android/support/design/{0}"
}
+ # Design lib - uncomment once migrated
+ #{
+ # "from": "android/support/design/widget/AppBarLayout(.*)",
+ # "to": "com/google/android/material/appbar/AppBarLayout{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/BaseTransientBottomBar(.*)",
+ # "to": "com/google/android/material/snackbar/BaseTransientBottomBar{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/BottomNavigationView(.*)",
+ # "to": "com/google/android/material/bottomnavigation/BottomNavigationView{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/BottomSheet(.*)",
+ # "to": "com/google/android/material/bottomsheet/BottomSheet{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/CheckableImageButton(.*)",
+ # "to": "com/google/android/material/internal/CheckableImageButton{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/CircularBorderDrawable(.*)",
+ # "to": "com/google/android/material/internal/CircularBorderDrawable{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/CollapsingTextHelper(.*)",
+ # "to": "com/google/android/material/internal/CollapsingTextHelper{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/CollapsingToolbarLayout(.*)",
+ # "to": "com/google/android/material/appbar/CollapsingToolbarLayout{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/CutoutDrawable(.*)",
+ # "to": "com/google/android/material/textfield/CutoutDrawable{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/DescendantOffsetUtils(.*)",
+ # "to": "com/google/android/material/internal/DescendantOffsetUtils{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/DrawableUtils(.*)",
+ # "to": "com/google/android/material/internal/DrawableUtils{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/FloatingActionButton(.*)",
+ # "to": "com/google/android/material/floatingactionbutton/FloatingActionButton{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/HeaderBehavior(.*)",
+ # "to": "com/google/android/material/appbar/HeaderBehavior{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/HeaderScrollingViewBehavior(.*)",
+ # "to": "com/google/android/material/appbar/HeaderScrollingViewBehavior{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/HideBottomViewOnScrollBehavior(.*)",
+ # "to": "com/google/android/material/behavior/HeaderScrollingViewBehavior{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/IndicatorViewController(.*)",
+ # "to": "com/google/android/material/textfield/IndicatorViewController{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/MathUtils(.*)",
+ # "to": "com/google/android/material/math/MathUtils{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/NavigationView(.*)",
+ # "to": "com/google/android/material/navigation/NavigationView{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/Shadow(.*)",
+ # "to": "com/google/android/material/shadow/Shadow{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/Snackbar(.*)",
+ # "to": "com/google/android/material/snackbar/Snackbar{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/SnackbarManager(.*)",
+ # "to": "com/google/android/material/snackbar/SnackbarManager{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/StateListAnimator(.*)",
+ # "to": "com/google/android/material/internal/StateListAnimator{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/SwipeDismissBehavior(.*)",
+ # "to": "com/google/android/material/behavior/SwipeDismissBehavior{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/Tab(.*)",
+ # "to": "com/google/android/material/tabs/Tab{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/TextInput(.*)",
+ # "to": "com/google/android/material/textfield/TextInput{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/ViewOffsetBehavior(.*)",
+ # "to": "com/google/android/material/appbar/ViewOffsetBehavior{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/ViewOffsetHelper(.*)",
+ # "to": "com/google/android/material/appbar/ViewOffsetHelper{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/ViewUtilsLollipop(.*)",
+ # "to": "com/google/android/material/appbar/ViewUtilsLollipop{0}"
+ #},
+ #{
+ # "from": "android/support/design/widget/VisibilityAwareImageButton(.*)",
+ # "to": "com/google/android/material/internal/VisibilityAwareImageButton{0}"
+ #},
+ #{
+ # "from": "android/support/design/internal/BottomNavigation(.*)",
+ # "to": "com/google/android/material/bottomnavigation/BottomNavigation{0}"
+ #},
+ #{
+ # "from": "android/support/design/internal/SnackbarContentLayout(.*)",
+ # "to": "com/google/android/material/snackbar/SnackbarContentLayout{0}"
+ #},
+ #{
+ # "from": "android/support/design/animation/(.*)",
+ # "to": "com/google/android/material/animation/{0}"
+ #},
+ #{
+ # "from": "android/support/design/bottomappbar/(.*)",
+ # "to": "com/google/android/material/bottomappbar/{0}"
+ #},
+ #{
+ # "from": "android/support/design/bottomnavigation/(.*)",
+ # "to": "com/google/android/material/bottomnavigation/{0}"
+ #},
+ #{
+ # "from": "android/support/design/button/(.*)",
+ # "to": "com/google/android/material/button/{0}"
+ #},
+ #{
+ # "from": "android/support/design/canvas/(.*)",
+ # "to": "com/google/android/material/canvas/{0}"
+ #},
+ #{
+ # "from": "android/support/design/card/(.*)",
+ # "to": "com/google/android/material/card/{0}"
+ #},
+ #{
+ # "from": "android/support/design/chip/(.*)",
+ # "to": "com/google/android/material/chip/{0}"
+ #},
+ #{
+ # "from": "android/support/design/circularreveal/(.*)",
+ # "to": "com/google/android/material/circularreveal/{0}"
+ #},
+ #{
+ # "from": "android/support/design/circularreveal/cardview/(.*)",
+ # "to": "com/google/android/material/circularreveal/cardview/{0}"
+ #},
+ #{
+ # "from": "android/support/design/circularreveal/coordinatorlayout/(.*)",
+ # "to": "com/google/android/material/circularreveal/coordinatorlayout/{0}"
+ #},
+ #{
+ # "from": "android/support/design/drawable/(.*)",
+ # "to": "com/google/android/material/drawable/{0}"
+ #},
+ #{
+ # "from": "android/support/design/expandable/(.*)",
+ # "to": "com/google/android/material/expandable/{0}"
+ #},
+ #{
+ # "from": "android/support/design/internal/(.*)",
+ # "to": "com/google/android/material/internal/{0}"
+ #},
+ #{
+ # "from": "android/support/design/math/(.*)",
+ # "to": "com/google/android/material/math/{0}"
+ #},
+ #{
+ # "from": "android/support/design/resources/(.*)",
+ # "to": "com/google/android/material/resources/{0}"
+ #},
+ #{
+ # "from": "android/support/design/ripple/(.*)",
+ # "to": "com/google/android/material/ripple/{0}"
+ #},
+ #{
+ # "from": "android/support/design/shape/(.*)",
+ # "to": "com/google/android/material/shape/{0}"
+ #},
+ #{
+ # "from": "android/support/design/snackbar/(.*)",
+ # "to": "com/google/android/material/snackbar/{0}"
+ #},
+ #{
+ # "from": "android/support/design/stateful/(.*)",
+ # "to": "com/google/android/material/stateful/{0}"
+ #},
+ #{
+ # "from": "android/support/design/theme/(.*)",
+ # "to": "com/google/android/material/theme/{0}"
+ #},
+ #{
+ # "from": "android/support/design/transformation/(.*)",
+ # "to": "com/google/android/material/transformation/{0}"
+ #},
+ #{
+ # "from": "android/support/design/R(.*)",
+ # "to": "com/google/android/material/R{0}"
+ #}
],
"slRules": [
# Ignore
@@ -923,8 +932,14 @@
"to": "ignore"
},
{
- "from": "androidx/media/subtitle/(.*)",
- "to": "android/support/v4/media/subtitle/{0}"
+ "from": "androidx/car/(.*)",
+ "to": "ignore"
+ },
+
+ # Fallback for new media stuff
+ {
+ "from": "androidx/media/(.*)",
+ "to": "android/support/v4/media/{0}"
}
],
"pomRules": [
@@ -1150,115 +1165,115 @@
},
{
"from": { "groupId": "android.arch.background.workmanager", "artifactId": "workmanager", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.work", "artifactId": "runtime", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.work", "artifactId": "runtime", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.background.workmanager", "artifactId": "workmanager-firebase", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.work", "artifactId": "runtime-firebase", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.work", "artifactId": "runtime-firebase", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.navigation", "artifactId": "runtime", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.navigation", "artifactId": "navigation-runtime", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.navigation", "artifactId": "navigation-runtime", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.navigation", "artifactId": "fragment", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.navigation", "artifactId": "navigation-fragment", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.navigation", "artifactId": "navigation-fragment", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.core", "artifactId": "common", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.arch.core", "artifactId": "core-common", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.arch.core", "artifactId": "core-common", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.core", "artifactId": "core", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.arch.core", "artifactId": "core", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.arch.core", "artifactId": "core", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.core", "artifactId": "core-testing", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.arch.core", "artifactId": "core-testing", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.arch.core", "artifactId": "core-testing", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.core", "artifactId": "runtime", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.arch.core", "artifactId": "core-runtime", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.arch.core", "artifactId": "core-runtime", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "common", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "common-java8", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common-java8", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common-java8", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "compiler", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-compiler", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-compiler", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "extensions", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-extensions", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-extensions", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "reactivestreams", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "runtime", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "viewmodel", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "livedata", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.lifecycle", "artifactId": "livedata-core", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.paging", "artifactId": "common", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.paging", "artifactId": "paging-common", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.paging", "artifactId": "paging-common", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.paging", "artifactId": "runtime", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.paging", "artifactId": "paging-runtime", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.paging", "artifactId": "paging-runtime", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence", "artifactId": "db", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.sqlite", "artifactId": "sqlite", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.sqlite", "artifactId": "sqlite", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence", "artifactId": "db-framework", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.sqlite", "artifactId": "sqlite-framework", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.sqlite", "artifactId": "sqlite-framework", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "common", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-common", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-common", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "compiler", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-compiler", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-compiler", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "migration", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-migration", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-migration", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "runtime", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-runtime", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-runtime", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "rxjava2", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-rxjava2", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-rxjava2", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "testing", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-testing", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-testing", "version": "2.0.0" }]
},
{
"from": { "groupId": "android.arch.persistence.room", "artifactId": "guava", "version": "28.0.0" },
- "to": [{ "groupId": "androidx.room", "artifactId": "room-guava", "version": "1.0.0" }]
+ "to": [{ "groupId": "androidx.room", "artifactId": "room-guava", "version": "2.0.0" }]
},
{
"from": { "groupId": "com.android.support.constraint", "artifactId": "constraint-layout", "version": "1.1.0" },
diff --git a/jetifier/jetifier/core/src/main/resources/default.generated.config b/jetifier/jetifier/core/src/main/resources/default.generated.config
index 398cf9f..38c0050 100644
--- a/jetifier/jetifier/core/src/main/resources/default.generated.config
+++ b/jetifier/jetifier/core/src/main/resources/default.generated.config
@@ -580,8 +580,8 @@
"to": "androidx/collection/SimpleArrayMap{0}"
},
{
- "from": "android/support/v4/util/SparseArrayCompat(.*)",
- "to": "androidx/collection/SparseArrayCompat{0}"
+ "from": "android/support/v4/util/SparseArray(.*)",
+ "to": "androidx/collection/SparseArray{0}"
},
{
"from": "android/support/v4/provider/DocumentFile(.*)",
@@ -652,212 +652,8 @@
"to": "androidx/multidex/{0}"
},
{
- "from": "android/support/design/widget/AppBarLayout(.*)",
- "to": "com/google/android/material/appbar/AppBarLayout{0}"
- },
- {
- "from": "android/support/design/widget/BaseTransientBottomBar(.*)",
- "to": "com/google/android/material/snackbar/BaseTransientBottomBar{0}"
- },
- {
- "from": "android/support/design/widget/BottomNavigationView(.*)",
- "to": "com/google/android/material/bottomnavigation/BottomNavigationView{0}"
- },
- {
- "from": "android/support/design/widget/BottomSheet(.*)",
- "to": "com/google/android/material/bottomsheet/BottomSheet{0}"
- },
- {
- "from": "android/support/design/widget/CheckableImageButton(.*)",
- "to": "com/google/android/material/internal/CheckableImageButton{0}"
- },
- {
- "from": "android/support/design/widget/CircularBorderDrawable(.*)",
- "to": "com/google/android/material/internal/CircularBorderDrawable{0}"
- },
- {
- "from": "android/support/design/widget/CollapsingTextHelper(.*)",
- "to": "com/google/android/material/internal/CollapsingTextHelper{0}"
- },
- {
- "from": "android/support/design/widget/CollapsingToolbarLayout(.*)",
- "to": "com/google/android/material/appbar/CollapsingToolbarLayout{0}"
- },
- {
- "from": "android/support/design/widget/CutoutDrawable(.*)",
- "to": "com/google/android/material/textfield/CutoutDrawable{0}"
- },
- {
- "from": "android/support/design/widget/DescendantOffsetUtils(.*)",
- "to": "com/google/android/material/internal/DescendantOffsetUtils{0}"
- },
- {
- "from": "android/support/design/widget/DrawableUtils(.*)",
- "to": "com/google/android/material/internal/DrawableUtils{0}"
- },
- {
- "from": "android/support/design/widget/FloatingActionButton(.*)",
- "to": "com/google/android/material/floatingactionbutton/FloatingActionButton{0}"
- },
- {
- "from": "android/support/design/widget/HeaderBehavior(.*)",
- "to": "com/google/android/material/appbar/HeaderBehavior{0}"
- },
- {
- "from": "android/support/design/widget/HeaderScrollingViewBehavior(.*)",
- "to": "com/google/android/material/appbar/HeaderScrollingViewBehavior{0}"
- },
- {
- "from": "android/support/design/widget/HideBottomViewOnScrollBehavior(.*)",
- "to": "com/google/android/material/behavior/HeaderScrollingViewBehavior{0}"
- },
- {
- "from": "android/support/design/widget/IndicatorViewController(.*)",
- "to": "com/google/android/material/textfield/IndicatorViewController{0}"
- },
- {
- "from": "android/support/design/widget/MathUtils(.*)",
- "to": "com/google/android/material/math/MathUtils{0}"
- },
- {
- "from": "android/support/design/widget/NavigationView(.*)",
- "to": "com/google/android/material/navigation/NavigationView{0}"
- },
- {
- "from": "android/support/design/widget/Shadow(.*)",
- "to": "com/google/android/material/shadow/Shadow{0}"
- },
- {
- "from": "android/support/design/widget/Snackbar(.*)",
- "to": "com/google/android/material/snackbar/Snackbar{0}"
- },
- {
- "from": "android/support/design/widget/SnackbarManager(.*)",
- "to": "com/google/android/material/snackbar/SnackbarManager{0}"
- },
- {
- "from": "android/support/design/widget/StateListAnimator(.*)",
- "to": "com/google/android/material/internal/StateListAnimator{0}"
- },
- {
- "from": "android/support/design/widget/SwipeDismissBehavior(.*)",
- "to": "com/google/android/material/behavior/SwipeDismissBehavior{0}"
- },
- {
- "from": "android/support/design/widget/Tab(.*)",
- "to": "com/google/android/material/tabs/Tab{0}"
- },
- {
- "from": "android/support/design/widget/TextInput(.*)",
- "to": "com/google/android/material/textfield/TextInput{0}"
- },
- {
- "from": "android/support/design/widget/ViewOffsetBehavior(.*)",
- "to": "com/google/android/material/appbar/ViewOffsetBehavior{0}"
- },
- {
- "from": "android/support/design/widget/ViewOffsetHelper(.*)",
- "to": "com/google/android/material/appbar/ViewOffsetHelper{0}"
- },
- {
- "from": "android/support/design/widget/ViewUtilsLollipop(.*)",
- "to": "com/google/android/material/appbar/ViewUtilsLollipop{0}"
- },
- {
- "from": "android/support/design/widget/VisibilityAwareImageButton(.*)",
- "to": "com/google/android/material/internal/VisibilityAwareImageButton{0}"
- },
- {
- "from": "android/support/design/internal/BottomNavigation(.*)",
- "to": "com/google/android/material/bottomnavigation/BottomNavigation{0}"
- },
- {
- "from": "android/support/design/internal/SnackbarContentLayout(.*)",
- "to": "com/google/android/material/snackbar/SnackbarContentLayout{0}"
- },
- {
- "from": "android/support/design/animation/(.*)",
- "to": "com/google/android/material/animation/{0}"
- },
- {
- "from": "android/support/design/bottomappbar/(.*)",
- "to": "com/google/android/material/bottomappbar/{0}"
- },
- {
- "from": "android/support/design/bottomnavigation/(.*)",
- "to": "com/google/android/material/bottomnavigation/{0}"
- },
- {
- "from": "android/support/design/button/(.*)",
- "to": "com/google/android/material/button/{0}"
- },
- {
- "from": "android/support/design/canvas/(.*)",
- "to": "com/google/android/material/canvas/{0}"
- },
- {
- "from": "android/support/design/card/(.*)",
- "to": "com/google/android/material/card/{0}"
- },
- {
- "from": "android/support/design/chip/(.*)",
- "to": "com/google/android/material/chip/{0}"
- },
- {
- "from": "android/support/design/circularreveal/(.*)",
- "to": "com/google/android/material/circularreveal/{0}"
- },
- {
- "from": "android/support/design/circularreveal/cardview/(.*)",
- "to": "com/google/android/material/circularreveal/cardview/{0}"
- },
- {
- "from": "android/support/design/circularreveal/coordinatorlayout/(.*)",
- "to": "com/google/android/material/circularreveal/coordinatorlayout/{0}"
- },
- {
- "from": "android/support/design/drawable/(.*)",
- "to": "com/google/android/material/drawable/{0}"
- },
- {
- "from": "android/support/design/expandable/(.*)",
- "to": "com/google/android/material/expandable/{0}"
- },
- {
- "from": "android/support/design/internal/(.*)",
- "to": "com/google/android/material/internal/{0}"
- },
- {
- "from": "android/support/design/math/(.*)",
- "to": "com/google/android/material/math/{0}"
- },
- {
- "from": "android/support/design/resources/(.*)",
- "to": "com/google/android/material/resources/{0}"
- },
- {
- "from": "android/support/design/ripple/(.*)",
- "to": "com/google/android/material/ripple/{0}"
- },
- {
- "from": "android/support/design/shape/(.*)",
- "to": "com/google/android/material/shape/{0}"
- },
- {
- "from": "android/support/design/snackbar/(.*)",
- "to": "com/google/android/material/snackbar/{0}"
- },
- {
- "from": "android/support/design/stateful/(.*)",
- "to": "com/google/android/material/stateful/{0}"
- },
- {
- "from": "android/support/design/theme/(.*)",
- "to": "com/google/android/material/theme/{0}"
- },
- {
- "from": "android/support/design/transformation/(.*)",
- "to": "com/google/android/material/transformation/{0}"
+ "from": "android/support/design/(.*)",
+ "to": "android/support/design/{0}"
}
],
"slRules": [
@@ -892,6 +688,14 @@
{
"from": "androidx/textclassifier/(.*)",
"to": "ignore"
+ },
+ {
+ "from": "androidx/car/(.*)",
+ "to": "ignore"
+ },
+ {
+ "from": "androidx/media/(.*)",
+ "to": "android/support/v4/media/{0}"
}
],
"pomRules": [
@@ -1675,7 +1479,7 @@
{
"groupId": "androidx.work",
"artifactId": "runtime",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1689,7 +1493,7 @@
{
"groupId": "androidx.work",
"artifactId": "runtime-firebase",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1703,7 +1507,7 @@
{
"groupId": "androidx.navigation",
"artifactId": "navigation-runtime",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1717,7 +1521,7 @@
{
"groupId": "androidx.navigation",
"artifactId": "navigation-fragment",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1731,7 +1535,7 @@
{
"groupId": "androidx.arch.core",
"artifactId": "core-common",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1745,7 +1549,7 @@
{
"groupId": "androidx.arch.core",
"artifactId": "core",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1759,7 +1563,7 @@
{
"groupId": "androidx.arch.core",
"artifactId": "core-testing",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1773,7 +1577,7 @@
{
"groupId": "androidx.arch.core",
"artifactId": "core-runtime",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1787,7 +1591,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-common",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1801,7 +1605,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-common-java8",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1815,7 +1619,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-compiler",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1829,7 +1633,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-extensions",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1843,7 +1647,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-reactivestreams",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1857,7 +1661,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-runtime",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1871,7 +1675,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-viewmodel",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1885,7 +1689,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-livedata",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1899,7 +1703,7 @@
{
"groupId": "androidx.lifecycle",
"artifactId": "lifecycle-livedata-core",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1913,7 +1717,7 @@
{
"groupId": "androidx.paging",
"artifactId": "paging-common",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1927,7 +1731,7 @@
{
"groupId": "androidx.paging",
"artifactId": "paging-runtime",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1941,7 +1745,7 @@
{
"groupId": "androidx.sqlite",
"artifactId": "sqlite",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1955,7 +1759,7 @@
{
"groupId": "androidx.sqlite",
"artifactId": "sqlite-framework",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1969,7 +1773,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-common",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1983,7 +1787,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-compiler",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -1997,7 +1801,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-migration",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -2011,7 +1815,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-runtime",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -2025,7 +1829,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-rxjava2",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -2039,7 +1843,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-testing",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
@@ -2053,7 +1857,7 @@
{
"groupId": "androidx.room",
"artifactId": "room-guava",
- "version": "1.0.0"
+ "version": "2.0.0"
}
]
},
diff --git a/jetifier/jetifier/core/src/test/kotlin/com/android/tools/build/jetifier/core/TypeRewriterTest.kt b/jetifier/jetifier/core/src/test/kotlin/com/android/tools/build/jetifier/core/TypeRewriterTest.kt
index 72556a9..36aca0a 100644
--- a/jetifier/jetifier/core/src/test/kotlin/com/android/tools/build/jetifier/core/TypeRewriterTest.kt
+++ b/jetifier/jetifier/core/src/test/kotlin/com/android/tools/build/jetifier/core/TypeRewriterTest.kt
@@ -134,7 +134,7 @@
val config = Config(
restrictToPackagePrefixes = setOf(packagePrefix),
rulesMap = rewriteRulesMap,
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = emptySet(),
typesMap = typesMap,
proGuardMap = ProGuardTypesMap.EMPTY,
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/ChangeDetectionTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/ChangeDetectionTest.kt
index 92cb371..4861458 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/ChangeDetectionTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/ChangeDetectionTest.kt
@@ -46,7 +46,7 @@
RewriteRule(from = "android/support/v7/preference/Preference(.+)", to = "ignore"),
RewriteRule(from = "(.*)/R(.*)", to = "ignore")
),
- slRules = setOf(),
+ slRules = listOf(),
pomRewriteRules = setOf(
PomRewriteRule(
PomDependency(
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/map/MapGenerationTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/map/MapGenerationTest.kt
index 653f9f6..0bab05c 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/map/MapGenerationTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/map/MapGenerationTest.kt
@@ -139,13 +139,13 @@
object ScanTester {
- fun testThatRules(vararg rules: RewriteRule) = Step1(rules.toSet())
+ fun testThatRules(vararg rules: RewriteRule) = Step1(rules.toList())
- class Step1(private val rules: Set<RewriteRule>) {
+ class Step1(private val rules: List<RewriteRule>) {
fun withAllowedPrefixes(vararg prefixes: String) = Step2(rules, prefixes.toSet())
- class Step2(private val rules: Set<RewriteRule>, private val prefixes: Set<String>) {
+ class Step2(private val rules: List<RewriteRule>, private val prefixes: Set<String>) {
private val allTypes: MutableList<JavaType> = mutableListOf()
private var wasMapIncomplete = false
@@ -159,7 +159,7 @@
val config = Config(
restrictToPackagePrefixes = prefixes,
rulesMap = RewriteRulesMap(rules),
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = emptySet(),
typesMap = TypesMap.EMPTY,
proGuardMap = ProGuardTypesMap.EMPTY)
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/DependencyMappingTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/DependencyMappingTest.kt
index bc70508..d65deb4 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/DependencyMappingTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/DependencyMappingTest.kt
@@ -88,7 +88,7 @@
val config = Config(
restrictToPackagePrefixes = emptySet(),
rulesMap = RewriteRulesMap.EMPTY,
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = rules,
typesMap = TypesMap.EMPTY,
proGuardMap = ProGuardTypesMap.EMPTY,
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/ClassFilesMoveTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/ClassFilesMoveTest.kt
index 63a7d1e..26cd451 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/ClassFilesMoveTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/ClassFilesMoveTest.kt
@@ -44,7 +44,7 @@
RewriteRule("android/support/v7/preference/R(.*)", "ignore"),
RewriteRule("android/support/v4/(.*)", "ignore")
),
- slRules = setOf(
+ slRules = listOf(
RewriteRule("android/support/annotation/(.*)", "ignore"),
RewriteRule("android/support/v7/preference/R(.*)", "ignore"),
RewriteRule("android/support/v4/(.*)", "ignore")
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt
index 1c23991..881260b 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt
@@ -59,7 +59,7 @@
restrictToPackagePrefixes = prefixes,
rulesMap = RewriteRulesMap.EMPTY,
typesMap = typesMap,
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = emptySet(),
proGuardMap = ProGuardTypesMap.EMPTY,
packageMap = PackageMap.EMPTY)
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomDocumentTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomDocumentTest.kt
index a805f56..a0aa739 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomDocumentTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomDocumentTest.kt
@@ -401,7 +401,7 @@
restrictToPackagePrefixes = emptySet(),
rulesMap = RewriteRulesMap.EMPTY,
typesMap = TypesMap.EMPTY,
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = rules,
proGuardMap = ProGuardTypesMap.EMPTY,
packageMap = PackageMap.EMPTY)
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomRewriteInZipTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomRewriteInZipTest.kt
index ac95d1c..1e7a09c 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomRewriteInZipTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/pom/PomRewriteInZipTest.kt
@@ -39,7 +39,7 @@
private val TEST_CONFIG = Config(
restrictToPackagePrefixes = setOf("com/sample"),
rulesMap = RewriteRulesMap.EMPTY,
- slRules = setOf(),
+ slRules = listOf(),
pomRewriteRules = setOf(
PomRewriteRule(
from = PomDependency(
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/proguard/ProGuardTester.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/proguard/ProGuardTester.kt
index a4b38b5..0dded5e 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/proguard/ProGuardTester.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/proguard/ProGuardTester.kt
@@ -78,8 +78,8 @@
restrictToPackagePrefixes = prefixes,
rulesMap = RewriteRulesMap(rewriteRules
.map { RewriteRule(it.first, it.second) }
- .toSet()),
- slRules = emptySet(),
+ .toList()),
+ slRules = emptyList(),
pomRewriteRules = emptySet(),
typesMap = TypesMap(
types = javaTypes.map { JavaType(it.first) to JavaType(it.second) }.toMap()
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt
index 62f715a..299eac7 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt
@@ -338,7 +338,7 @@
val config = Config(
restrictToPackagePrefixes = prefixes,
rulesMap = RewriteRulesMap.EMPTY,
- slRules = emptySet(),
+ slRules = emptyList(),
pomRewriteRules = emptySet(),
typesMap = typeMap,
proGuardMap = ProGuardTypesMap.EMPTY,