Split deps.support into individual artifact groups

Make it more clear that each artifact group is independent from one another.

Test: ./run_all_tests.sh

BasicRxJavaSample/app/build.gradle

@@ -27,10 +27,9 @@ android {
 }
 
 dependencies {
-    // Support libraries
-    implementation deps.support.app_compat
-    implementation deps.support.fragment_runtime
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.fragment.runtime
+    implementation deps.material
     // Architecture components
     implementation deps.lifecycle.runtime
     annotationProcessor deps.lifecycle.compiler
@@ -49,8 +48,8 @@ dependencies {
     testImplementation deps.mockito.all
 
     // Resolve conflicts between main and local unit tests
-    testImplementation deps.support.annotations
-    testImplementation deps.support.core_utils
+    testImplementation deps.annotations
+    testImplementation deps.core_utils
 
     // Android Testing Support Library's runner and rules
     androidTestImplementation deps.atsl.ext_junit
@@ -70,7 +69,7 @@ dependencies {
     androidTestImplementation deps.espresso.intents
 
     // Resolve conflicts between main and test APK:
-    androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.app_compat
-    androidTestImplementation deps.support.design
+    androidTestImplementation deps.annotations
+    androidTestImplementation deps.app_compat
+    androidTestImplementation deps.material
 }

BasicRxJavaSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

BasicRxJavaSampleKotlin/app/build.gradle

@@ -47,10 +47,9 @@ android {
 }
 
 dependencies {
-    // Support libraries
-    implementation deps.support.app_compat
-    implementation deps.support.fragment_runtime_ktx
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.fragment.runtime_ktx
+    implementation deps.material
 
     // Architecture components
     implementation deps.lifecycle.runtime
@@ -63,7 +62,6 @@ dependencies {
     implementation deps.rx_android
     implementation deps.rxjava2
 
-    // kotlin
     // Kotlin
     implementation deps.kotlin.stdlib
 
@@ -93,7 +91,7 @@ dependencies {
     androidTestImplementation deps.espresso.intents
 
     // Resolve conflicts between main and test APK:
-    androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.app_compat
-    androidTestImplementation deps.support.design
+    androidTestImplementation deps.annotations
+    androidTestImplementation deps.app_compat
+    androidTestImplementation deps.material
 }

BasicRxJavaSampleKotlin/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

BasicSample/app/build.gradle

@@ -56,11 +56,10 @@ android {
 }
 
 dependencies {
-    // Support libraries
-    implementation deps.support.app_compat
-    implementation deps.support.fragment_runtime
-    implementation deps.support.design
-    implementation deps.support.cardview
+    implementation deps.app_compat
+    implementation deps.fragment.runtime
+    implementation deps.material
+    implementation deps.cardview
 
     // Architecture components
     implementation deps.lifecycle.runtime
@@ -82,7 +81,7 @@ dependencies {
     androidTestImplementation deps.espresso.intents
 
     // Resolve conflicts between main and test APK:
-    androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.app_compat
-    androidTestImplementation deps.support.design
+    androidTestImplementation deps.annotations
+    androidTestImplementation deps.app_compat
+    androidTestImplementation deps.material
 }

BasicSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

GithubBrowserSample/app/build.gradle

@@ -70,11 +70,11 @@ jacoco {
 }
 
 dependencies {
-    implementation deps.support.app_compat
-    implementation deps.support.recyclerview
-    implementation deps.support.cardview
-    implementation deps.support.design
-    implementation deps.support.core_ktx
+    implementation deps.app_compat
+    implementation deps.recyclerview
+    implementation deps.cardview
+    implementation deps.material
+    implementation deps.core_ktx
     implementation deps.navigation.fragment_ktx
     implementation deps.room.runtime
     implementation deps.lifecycle.livedata_ktx
@@ -107,10 +107,10 @@ dependencies {
     androidTestImplementation deps.atsl.runner
     androidTestImplementation deps.atsl.rules
 
-    androidTestImplementation deps.support.app_compat
-    androidTestImplementation deps.support.recyclerview
-    androidTestImplementation deps.support.cardview
-    androidTestImplementation deps.support.design
+    androidTestImplementation deps.app_compat
+    androidTestImplementation deps.recyclerview
+    androidTestImplementation deps.cardview
+    androidTestImplementation deps.material
 
     androidTestImplementation deps.espresso.core
     androidTestImplementation deps.espresso.contrib

GithubBrowserSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

LiveDataSample/app/build.gradle

@@ -50,9 +50,9 @@ android {
 }
 
 dependencies {
-    implementation deps.support.app_compat
-    implementation deps.support.design
-    implementation deps.support.core_ktx
+    implementation deps.app_compat
+    implementation deps.material
+    implementation deps.core_ktx
     implementation deps.lifecycle.runtime
     implementation deps.lifecycle.viewmodel_ktx
     implementation deps.lifecycle.livedata_ktx

LiveDataSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

NavigationAdvancedSample/app/build.gradle

@@ -47,9 +47,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation deps.kotlin.stdlib
-    implementation deps.support.app_compat
-    implementation deps.support.design
-    implementation deps.support.core_ktx
+    implementation deps.app_compat
+    implementation deps.material
+    implementation deps.core_ktx
     implementation deps.constraint_layout
     implementation deps.arch_core.runtime
 

NavigationAdvancedSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

NavigationBasicSample/app/build.gradle

@@ -65,18 +65,18 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation deps.kotlin.stdlib
-    implementation deps.support.app_compat
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.material
     implementation deps.constraint_layout
-    implementation deps.support.core_ktx
+    implementation deps.core_ktx
 
     implementation deps.lifecycle.viewmodel_ktx
 
     implementation deps.navigation.fragment_ktx
     implementation deps.navigation.runtime_ktx
-    implementation deps.support.fragment_runtime_ktx
+    implementation deps.fragment.runtime_ktx
     // "androidx.fragment:fragment-testing" must be scoped to all sourcesets.
-    implementation(deps.support.fragment_testing) {
+    implementation(deps.fragment.testing) {
         // Exclude androidx.test:core while fragment_testing depends on 1.1.0
         exclude group: 'androidx.test', module: 'core'
     }

NavigationBasicSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

PagingSample/app/build.gradle

@@ -48,10 +48,10 @@ android {
 }
 
 dependencies {
-    implementation deps.support.app_compat
-    implementation deps.support.fragment_runtime_ktx
-    implementation deps.support.recyclerview
-    implementation deps.support.cardview
+    implementation deps.app_compat
+    implementation deps.fragment.runtime_ktx
+    implementation deps.recyclerview
+    implementation deps.cardview
     implementation deps.room.runtime
     implementation deps.lifecycle.runtime
     implementation deps.paging_ktx

PagingSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

PagingWithNetworkSample/app/build.gradle

@@ -61,11 +61,11 @@ dependencies {
     kapt deps.glide.compiler
 
     implementation deps.constraint_layout
-    implementation deps.support.app_compat
-    implementation deps.support.fragment_runtime_ktx
-    implementation deps.support.recyclerview
-    implementation deps.support.cardview
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.fragment.runtime_ktx
+    implementation deps.recyclerview
+    implementation deps.cardview
+    implementation deps.material
     implementation deps.room.runtime
     implementation deps.lifecycle.livedata_ktx
     implementation deps.lifecycle.runtime

PagingWithNetworkSample/benchmark/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':lib')
 
-    implementation deps.support.app_compat
+    implementation deps.app_compat
     implementation deps.paging_ktx
 
     androidTestImplementation deps.atsl.ext_junit

PagingWithNetworkSample/lib/build.gradle

@@ -33,10 +33,10 @@ dependencies {
     kapt deps.glide.compiler
 
     implementation deps.constraint_layout
-    implementation deps.support.app_compat
-    implementation deps.support.recyclerview
-    implementation deps.support.cardview
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.recyclerview
+    implementation deps.cardview
+    implementation deps.material
     implementation deps.room.runtime
     implementation deps.lifecycle.livedata_ktx
     implementation deps.lifecycle.runtime

PagingWithNetworkSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

PersistenceContentProviderSample/app/build.gradle

@@ -51,11 +51,9 @@ dependencies {
     androidTestImplementation deps.atsl.core
     androidTestImplementation deps.atsl.ext_junit
 
-    // Support Libraries
-    implementation deps.support.app_compat
-    implementation deps.support.recyclerview
+    implementation deps.app_compat
+    implementation deps.recyclerview
 
-    // App Toolkit
     implementation deps.room.runtime
     annotationProcessor deps.lifecycle.compiler
     annotationProcessor deps.room.compiler

PersistenceContentProviderSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

PersistenceMigrationsSample/app/build.gradle

@@ -84,9 +84,8 @@ android {
 }
 
 dependencies {
-    //Support libraries
-    implementation deps.support.app_compat
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.material
     implementation deps.room.runtime
     annotationProcessor deps.room.compiler
 
@@ -113,7 +112,7 @@ dependencies {
     androidTestImplementation deps.espresso.intents
 
     // Resolve conflicts between main and test APK:
-    androidTestImplementation deps.support.annotations
-    androidTestImplementation deps.support.app_compat
-    androidTestImplementation deps.support.design
+    androidTestImplementation deps.annotations
+    androidTestImplementation deps.app_compat
+    androidTestImplementation deps.material
 }

PersistenceMigrationsSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

WorkManagerSample/app/build.gradle

@@ -52,10 +52,10 @@ dependencies {
 
     implementation deps.kotlin.stdlib
     implementation deps.work.runtime_ktx
-    implementation deps.support.app_compat
-    implementation deps.support.cardview
-    implementation deps.support.design
-    implementation deps.support.fragment_runtime_ktx
+    implementation deps.app_compat
+    implementation deps.cardview
+    implementation deps.material
+    implementation deps.fragment.runtime_ktx
     implementation deps.constraint_layout
     implementation deps.arch_core.runtime
     implementation deps.retrofit.runtime

WorkManagerSample/lib/build.gradle

@@ -28,9 +28,9 @@ dependencies {
 
     implementation deps.kotlin.stdlib
     implementation deps.work.runtime_ktx
-    implementation deps.support.app_compat
-    implementation deps.support.cardview
-    implementation deps.support.design
+    implementation deps.app_compat
+    implementation deps.cardview
+    implementation deps.material
     implementation deps.constraint_layout
     implementation deps.retrofit.runtime
     implementation deps.retrofit.gson

WorkManagerSample/versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"

versions.gradle

@@ -68,18 +68,19 @@ def deps = [:]
 deps.benchmark = "androidx.benchmark:benchmark-junit4:$versions.benchmark"
 deps.benchmark_gradle = "androidx.benchmark:benchmark-gradle-plugin:$versions.benchmark"
 
-def support = [:]
-support.annotations = "androidx.annotation:annotation:$versions.annotations"
-support.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
-support.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
-support.cardview = "androidx.cardview:cardview:$versions.cardview"
-support.design = "com.google.android.material:material:$versions.material"
-support.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
-support.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
-support.fragment_runtime = "androidx.fragment:fragment:${versions.fragment}"
-support.fragment_runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
-support.fragment_testing = "androidx.fragment:fragment-testing:${versions.fragment}"
-deps.support = support
+deps.annotations = "androidx.annotation:annotation:$versions.annotations"
+deps.app_compat = "androidx.appcompat:appcompat:$versions.appcompat"
+deps.recyclerview = "androidx.recyclerview:recyclerview:$versions.recyclerview"
+deps.cardview = "androidx.cardview:cardview:$versions.cardview"
+deps.material = "com.google.android.material:material:$versions.material"
+deps.core_utils = "androidx.legacy:legacy-support-core-utils:$versions.core_utils"
+deps.core_ktx = "androidx.core:core-ktx:$versions.core_ktx"
+
+def fragment = [:]
+fragment.runtime = "androidx.fragment:fragment:${versions.fragment}"
+fragment.runtime_ktx = "androidx.fragment:fragment-ktx:${versions.fragment}"
+fragment.testing = "androidx.fragment:fragment-testing:${versions.fragment}"
+deps.fragment = fragment
 
 def room = [:]
 room.runtime = "androidx.room:room-runtime:$versions.room"