Merge pull request #15 from MarcDonald/develop

Version 1.1.0

.gitignore

@@ -42,6 +42,8 @@ captures/
 .idea/libraries
 .idea/caches
 .idea/sonarlint
+.idea/markdown-navigator.xml
+.idea/markdown-navigator
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.

app/build.gradle

@@ -12,8 +12,9 @@ android {
         applicationId "app.marcdev.earworm"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 12
-        versionName "1.0.0"
+        versionCode 15
+        versionName "1.1.0"
+        setProperty("archivesBaseName", "Earworm-v$versionName")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -30,14 +31,23 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
+
+    // AndroidX
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
     implementation 'androidx.preference:preference:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
     implementation 'com.google.android.material:material:1.0.0'
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-alpha01"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-alpha01"
+
+    // Testing
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     // Timber for logging
     implementation('com.jakewharton.timber:timber:4.7.0')
@@ -47,14 +57,14 @@ dependencies {
     kapt 'androidx.room:room-compiler:2.0.0'
     androidTestImplementation 'androidx.room:room-testing:2.0.0'
 
-    // Kotlin co-routines for asynchronous code
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
+    // Kodein
+    implementation 'org.kodein.di:kodein-di-generic-jvm:6.0.1'
+    implementation 'org.kodein.di:kodein-di-framework-android-x:6.0.1'
 
     // Glide for image loading and caching
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
     kapt 'com.github.bumptech.glide:compiler:4.8.0'
 
     // Android File Picker for choosing an image
-    implementation 'com.droidninja:filepicker:2.2.0'
+    implementation 'com.droidninja:filepicker:2.2.1'
 }