Reverted unwanted merging changes from latest commit.

build.gradle

@@ -1,48 +1,50 @@
+/**
+ * The buildscript block is where you configure the repositories and
+ * dependencies for Gradle itself—meaning, you should not include dependencies
+ * for your modules here. For example, this block includes the Android plugin for
+ * Gradle as a dependency because it provides the additional instructions Gradle
+ * needs to build Android app modules.
+ */
 buildscript {
     ext {
         versions = [
-                kotlin                    : "1.5.0",
-                moshi                     : '1.8.0',
-                okhttp                    : '3.11.0',
-                jupiter                   : '5.7.0',
+            kotlin                    : "1.5.31",
+            moshi                     : '1.12.0',
+            okhttp                    : '4.9.1',
+            jupiter                   : '5.8.1',
 
-                'minSdk'                  : 14,
-                'compileSdk'              : 28,
-                'buildTools'              : '28.0.3',
-                'androidPlugin'           : '3.4.0',
+            'minSdk'                  : 28,
+            'compileSdk'              : 31,
 
-                androidx_app_compat       : '1.0.2',
-                androidx_card_view        : '1.0.0',
-                androidx_constraint_layout: '1.1.3',
-                androidx_lifecycle        : '2.0.0',
-                androidx_test_ext         : '1.1.0',
-                androidx_recycler_view    : '1.0.0',
-                androidx_room             : '2.0.0',
+            androidx_app_compat       : '1.3.1',
+            androidx_card_view        : '1.0.0',
+            androidx_constraint_layout: '1.1.3',
+            androidx_lifecycle        : '2.0.0',
+            androidx_test_ext         : '1.1.0',
+            androidx_recycler_view    : '1.0.0',
+            androidx_room             : '2.0.0',
 
-                multidex                  : '2.0.1',
+            khex                      : '1.1.2'
         ]
-
-        ext.deps = [
-                android: [
-                        'runtime'     : 'com.google.android:android:4.1.1.4',
-                        'gradlePlugin': "com.android.tools.build:gradle:${versions.androidPlugin}",
-                ]
-        ]
-    }
-
-    repositories {
-        google()
-        gradlePluginPortal()
-	    mavenCentral()
     }
 
+    /**
+     * The dependencies block configures the dependencies Gradle needs to use
+     * to build your project. The following line adds Android plugin for Gradle
+     * version 4.2.0 as a classpath dependency.
+     */
     dependencies {
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
-        classpath 'com.android.tools.build:gradle:4.2.1'
-        // How can we move this to the sample folder
-        //classpath deps.android.gradlePlugin
+    }
+    repositories {
+        google()
     }
 }
 
-apply plugin: "com.github.ben-manes.versions"
+// By default, the plugins {} DSL resolves plugins from the public Gradle Plugin Portal. Apply not
+// needed when using this.
+plugins {
+    // Checks for newer lib versions.
+    id "com.github.ben-manes.versions" version "0.39.0"
+}