Revert "Update Navigation, fragment_ktx, core_ktx to Google3"
This reverts commit e8869f06b0adae7a0db75d550ade9d7e84f73d18.
Reason for revert: This breaks compat support library, working on a fix
Change-Id: I32df23af89e0c55a564518efe23091b849140bad
diff --git a/buildSrc/src/main/kotlin/androidx/build/Jetify.kt b/buildSrc/src/main/kotlin/androidx/build/Jetify.kt
index 175d836..c1ea146 100644
--- a/buildSrc/src/main/kotlin/androidx/build/Jetify.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/Jetify.kt
@@ -38,11 +38,9 @@
"m2repository/androidx/car/**",
"m2repository/androidx/cardview/**",
"m2repository/androidx/collection/collection/**",
- "m2repository/androidx/collection/collection-ktx/**",
"m2repository/androidx/contentpager/**",
"m2repository/androidx/coordinatorlayout/**",
"m2repository/androidx/core/core/**",
- "m2repository/androidx/core/core-ktx/**",
"m2repository/androidx/cursoradapter/**",
"m2repository/androidx/customview/**",
"m2repository/androidx/documentfile/**",
@@ -51,7 +49,6 @@
"m2repository/androidx/emoji/**",
"m2repository/androidx/exifinterface/**",
"m2repository/androidx/fragment/fragment/**",
- "m2repository/androidx/fragment/fragment-ktx/**",
"m2repository/androidx/gridlayout/**",
"m2repository/androidx/heifwriter/**",
"m2repository/androidx/interpolator/**",
diff --git a/jetifier/jetifier/migration.config b/jetifier/jetifier/migration.config
index 3e55c71..f46eae3 100644
--- a/jetifier/jetifier/migration.config
+++ b/jetifier/jetifier/migration.config
@@ -411,14 +411,6 @@
"to": "androidx/activity/{0}"
},
{
- "from": "androidx/core/(.*)",
- "to": "androidx/core/{0}"
- },
- {
- "from": "androidx/collection/(.*)",
- "to": "androidx/collection/{0}"
- },
- {
"from": "android/support/test/(.*)",
"to": "androidx/test/{0}"
}
@@ -437,22 +429,6 @@
"to": "ignore"
},
{
- "from": "androidx/fragment/app/ViewKt(.*)",
- "to": "ignore"
- },
- {
- "from": "androidx/fragment/app/FragmentManagerKt(.*)",
- "to": "ignore"
- },
- {
- "from": "androidx/fragment/app/FragmentTransactionKt(.*)",
- "to": "ignore"
- },
- {
- "from": "androidx/fragment/app/FragmentViewModelLazyKt(.*)",
- "to": "ignore"
- },
- {
"from": "androidx/gridlayout/widget/GridLayout(.*)",
"to": "ignore"
},
@@ -825,14 +801,6 @@
"to": "ignore"
},
{
- "from": "androidx/core/(.*)",
- "to": "ignore"
- },
- {
- "from": "androidx/collection/(.*)",
- "to": "ignore"
- },
- {
"from": "androidx/savedstate/(.*)",
"to": "ignore"
},
@@ -1262,42 +1230,6 @@
},
{
"from": {
- "groupId": "androidx.fragment",
- "artifactId": "fragment-ktx",
- "version": "{oldSlVersion}"
- },
- "to": {
- "groupId": "androidx.fragment",
- "artifactId": "fragment-ktx",
- "version": "{newSlVersion}"
- }
- },
- {
- "from": {
- "groupId": "androidx.collection",
- "artifactId": "collection-ktx",
- "version": "{oldSlVersion}"
- },
- "to": {
- "groupId": "androidx.collection",
- "artifactId": "collection-ktx",
- "version": "{newSlVersion}"
- }
- },
- {
- "from": {
- "groupId": "androidx.core",
- "artifactId": "core-ktx",
- "version": "{oldSlVersion}"
- },
- "to": {
- "groupId": "androidx.core",
- "artifactId": "core-ktx",
- "version": "{newSlVersion}"
- }
- },
- {
- "from": {
"groupId": "androidx.savedstate",
"artifactId": "savedstate",
"version": "{newSlVersion}"