Merge branch 'master' of D:\Android Studio Projects\Private work\Altas_-_Weather with conflicts.

app/build.gradle

@@ -1,15 +1,23 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+// kotlin kapt
+apply plugin: 'kotlin-kapt'
+// Android navigation
+apply plugin: 'androidx.navigation.safeargs'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.appttude.h_mal.atlas_weather"
         minSdkVersion 23
-        targetSdkVersion 26
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
+
+        buildConfigField "String", "ParamOne", "${paramOneEndPoint}"
     }
     buildTypes {
         release {
@@ -17,20 +25,73 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    // To inline the bytecode built with JVM target 1.8 into
+    // bytecode that is being built with JVM target 1.6. (e.g. navArgs)
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
-    implementation 'com.android.support:support-vector-drawable:26.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
     implementation "com.google.android.gms:play-services-location:16.0.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
+    // Unit testing
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-    implementation 'com.android.support:cardview-v7:26.1.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-test:1.3.71"
+
+    // android unit testing and espresso
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    implementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    //mock websever for testing retrofit responses
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.6.0"
+    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
+
+    //mockito and livedata testing
+    testImplementation 'org.mockito:mockito-inline:2.13.0'
+    implementation 'android.arch.core:core-testing'
+    androidTestImplementation 'androidx.test:rules:1.3.0-rc01'
+
+    // Mockk
+    def mockk_ver = "1.10.2"
+    testImplementation "io.mockk:mockk:$mockk_ver"
+    androidTestImplementation "io.mockk:mockk-android:$mockk_ver"
+
+    // Retrofit
+    implementation 'com.squareup.retrofit2:retrofit:2.8.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
+
+    // Shared prefs
+    implementation "androidx.preference:preference-ktx:1.1.1"
+
+    //Kodein Dependency Injection
+    def kodein_version = "6.2.1"
+    implementation "org.kodein.di:kodein-di-generic-jvm:$kodein_version"
+    implementation "org.kodein.di:kodein-di-framework-android-x:$kodein_version"
+
+    // Room database
+     def room_version = "2.3.0-alpha03"
+     implementation "androidx.room:room-runtime:$room_version"
+     kapt "androidx.room:room-compiler:$room_version"
+     implementation "androidx.room:room-ktx:$room_version"
+
+    // Picasso
+    implementation 'com.squareup.picasso:picasso:2.71828'
 }