Merge branch 'develop'

Author: asherepenko

README.md

@@ -2,6 +2,7 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![CircleCI](https://circleci.com/gh/asherepenko/launchiteasy.svg?style=svg&circle-token=9d39fddaddad3536601814fbed8a2ffbcce72ece)](https://circleci.com/gh/asherepenko/launchiteasy)
+[![Latest Version](https://img.shields.io/github/v/tag/asherepenko/launchiteasy?sort=date)](https://github.com/asherepenko/launchiteasy/releases)
 
 **Yet Another Launcher**
 

app/build.gradle.kts

@@ -1,31 +1,31 @@
+import com.github.triplet.gradle.androidpublisher.ReleaseStatus
 import java.io.FileInputStream
 import java.util.Properties
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 plugins {
     id("com.android.application")
-    id("com.github.triplet.play") version "2.7.2"
-    id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
+    id("com.github.triplet.play") version "3.0.0"
+    id("com.sherepenko.gradle.plugin-build-version") version "0.2.3"
+    id("org.jlleitschuh.gradle.ktlint") version "9.4.0"
     kotlin("android")
     kotlin("android.extensions")
     kotlin("kapt")
 }
 
 val archivesBaseName = "launchiteasy"
-val buildVersion = BuildVersion(rootProject.file("version"))
 
 val localPropertiesFile = rootProject.file("local.properties")
 val keystorePropertiesFile = rootProject.file("keystore.properties")
 val playstorePropertiesFile = rootProject.file("playstore.properties")
 
 android {
-    compileSdkVersion(29)
+    compileSdkVersion(30)
 
     defaultConfig {
         minSdkVersion(23)
-        targetSdkVersion(29)
+        targetSdkVersion(30)
         applicationId = "com.sherepenko.android.launchiteasy"
         versionCode = buildVersion.versionCode
         versionName = buildVersion.versionName
@@ -36,7 +36,7 @@ android {
 
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = mapOf("room.schemaLocation" to "$projectDir/schemas")
+                argument("room.schemaLocation", "$projectDir/schemas")
             }
         }
 
@@ -61,11 +61,21 @@ android {
         buildConfigField("int", "WEATHER_FORECASTS_LIMIT", "12")
     }
 
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
+
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
     lintOptions {
         ignore("InvalidPackage")
     }
@@ -138,44 +148,44 @@ play {
             load(FileInputStream(playstorePropertiesFile))
         }
 
-        serviceAccountCredentials = rootProject.file(
-            playstoreProperties.getProperty("playstore.credentials")
+        serviceAccountCredentials.set(
+            rootProject.file(playstoreProperties.getProperty("playstore.credentials"))
         )
-        defaultToAppBundles = true
-        track = "alpha"
-        releaseStatus = "inProgress"
+        defaultToAppBundles.set(true)
+        track.set("alpha")
+        releaseStatus.set(ReleaseStatus.IN_PROGRESS)
     } else if (!System.getenv("PLAYSTORE_CREDENTIALS").isNullOrEmpty()) {
-        serviceAccountCredentials = rootProject.file(
-            System.getenv("PLAYSTORE_CREDENTIALS")
+        serviceAccountCredentials.set(
+            rootProject.file(System.getenv("PLAYSTORE_CREDENTIALS"))
         )
-        defaultToAppBundles = true
-        track = "alpha"
-        releaseStatus = "inProgress"
+        defaultToAppBundles.set(true)
+        track.set("alpha")
+        releaseStatus.set(ReleaseStatus.IN_PROGRESS)
     } else {
-        isEnabled = false
+        enabled.set(false)
     }
 }
 
-val glideVersion = "4.11.0"
-val jacksonVersion = "2.11.0"
-val koinVersion = "2.1.5"
+val jacksonVersion = "2.11.3"
+val koinVersion = "2.2.0-rc-4"
 val lifecycleVersion = "2.2.0"
-val navigationVersion = "2.3.0-alpha06"
-val okHttpVersion = "4.6.0"
-val retrofitVersion = "2.8.1"
+val navigationVersion = "2.3.0"
+val okHttpVersion = "4.9.0"
+val retrofitVersion = "2.9.0"
 val roomVersion = "2.2.5"
-val workVersion = "2.3.4"
+val stethoVersion = "1.5.1"
+val workVersion = "2.4.0"
 
 dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.0")
     kapt("androidx.lifecycle:lifecycle-compiler:$lifecycleVersion")
     kapt("androidx.room:room-compiler:$roomVersion")
-    kapt("com.github.bumptech.glide:compiler:$glideVersion")
     implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
-    implementation("androidx.appcompat:appcompat:1.1.0")
+    implementation("androidx.appcompat:appcompat:1.2.0")
     implementation("androidx.collection:collection-ktx:1.1.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta5")
-    implementation("androidx.core:core-ktx:1.2.0")
-    implementation("androidx.fragment:fragment-ktx:1.2.4")
+    implementation("androidx.constraintlayout:constraintlayout:2.0.4")
+    implementation("androidx.core:core-ktx:1.3.2")
+    implementation("androidx.fragment:fragment-ktx:1.3.0-beta01")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
@@ -186,23 +196,24 @@ dependencies {
     implementation("androidx.preference:preference-ktx:1.1.1")
     implementation("androidx.room:room-runtime:$roomVersion")
     implementation("androidx.room:room-ktx:$roomVersion")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.work:work-runtime-ktx:$workVersion")
+    implementation("com.facebook.stetho:stetho:$stethoVersion")
+    implementation("com.facebook.stetho:stetho-okhttp3:$stethoVersion")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
-    implementation("com.github.bumptech.glide:glide:$glideVersion")
+    implementation("io.coil-kt:coil:1.0.0")
     implementation("io.github.inflationx:calligraphy3:3.1.1")
     implementation("io.github.inflationx:viewpump:2.0.3")
-    implementation("com.google.android.gms:play-services-location:17.0.0")
-    implementation("com.google.android.material:material:1.2.0-alpha06")
-    implementation("com.google.firebase:firebase-analytics:17.4.1")
-    implementation("com.google.firebase:firebase-config-ktx:19.1.4")
-    implementation("com.google.firebase:firebase-crashlytics:17.0.0")
-    implementation("com.google.firebase:firebase-messaging:20.1.7")
-    implementation("com.google.firebase:firebase-perf:19.0.7")
-    implementation("com.jakewharton.threetenabp:threetenabp:1.2.2")
+    implementation("com.google.android.gms:play-services-location:17.1.0")
+    implementation("com.google.android.material:material:1.3.0-alpha03")
+    implementation("com.google.firebase:firebase-analytics-ktx:18.0.0")
+    implementation("com.google.firebase:firebase-config-ktx:20.0.0")
+    implementation("com.google.firebase:firebase-crashlytics-ktx:17.2.2")
+    implementation("com.google.firebase:firebase-messaging:21.0.0")
+    implementation("com.google.firebase:firebase-perf:19.0.9")
     implementation("com.jakewharton.timber:timber:4.7.1")
     implementation("com.squareup.okhttp3:okhttp:$okHttpVersion")
     implementation("com.squareup.okhttp3:logging-interceptor:$okHttpVersion")
@@ -213,39 +224,17 @@ dependencies {
     implementation("org.koin:koin-androidx-viewmodel:$koinVersion")
     debugImplementation("com.squareup.leakcanary:leakcanary-android:2.3")
     testImplementation("junit:junit:4.13")
-    testImplementation("androidx.test:core:1.2.0")
-    testImplementation("androidx.test:runner:1.2.0")
-    testImplementation("androidx.test.ext:junit:1.1.1")
-    testImplementation("com.google.truth:truth:0.44")
-    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    testImplementation("androidx.test:core:1.3.0")
+    testImplementation("androidx.test:runner:1.3.0")
+    testImplementation("androidx.test.ext:junit:1.1.2")
+    testImplementation("com.google.truth:truth:1.0.1")
+    testImplementation("io.mockk:mockk:1.10.2")
     testImplementation("org.koin:koin-test:$koinVersion")
-    testImplementation("org.robolectric:robolectric:4.3.1")
-}
-
-tasks {
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
-
-    val incrementMajor by registering(IncrementVersion::class) {
-        increment = Increment.MAJOR
-        version = buildVersion
-    }
-
-    val incrementMinor by registering(IncrementVersion::class) {
-        increment = Increment.MINOR
-        version = buildVersion
-    }
-
-    val incrementPatch by registering(IncrementVersion::class) {
-        increment = Increment.PATCH
-        version = buildVersion
-    }
+    testImplementation("org.robolectric:robolectric:4.4")
 }
 
 apply(plugin = "androidx.navigation.safeargs.kotlin")
 apply(plugin = "com.google.gms.google-services")
 apply(plugin = "com.google.firebase.crashlytics")
 apply(plugin = "com.google.firebase.firebase-perf")
+apply(plugin = "koin")

app/proguard-rules.pro

@@ -21,16 +21,6 @@
     *;
 }
 
-# Glide
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
-
--dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
-
 # Jackson
 -keep class com.fasterxml.jackson.databind.ObjectMapper {
     public <methods>;

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
+    <uses-permission android:name="com.android.alarm.permission.WAKE_LOCK" />
 
     <supports-screens
             android:smallScreens="false" />

app/src/main/java/com/sherepenko/android/launchiteasy/LauncherApp.kt

@@ -4,11 +4,11 @@ import android.app.Application
 import android.util.Log
 import androidx.preference.PreferenceManager
 import androidx.room.Room
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.module.AppGlideModule
+import com.facebook.stetho.Stetho
+import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.jakewharton.threetenabp.AndroidThreeTen
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
 import com.sherepenko.android.launchiteasy.api.OpenWeatherApi
 import com.sherepenko.android.launchiteasy.data.db.AppDatabase
 import com.sherepenko.android.launchiteasy.livedata.AppStateLiveData
@@ -40,12 +40,15 @@ import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.component.KoinApiExtension
 import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
 import timber.log.Timber
 
+@KoinApiExtension
 class LauncherApp : Application() {
 
     companion object {
@@ -67,16 +70,13 @@ class LauncherApp : Application() {
         single {
             OkHttpClient.Builder()
                 .addInterceptor(
-                    HttpLoggingInterceptor(
-                        object : HttpLoggingInterceptor.Logger {
-                            override fun log(message: String) {
-                                Timber.tag(tag).i(message)
-                            }
-                        }
-                    ).apply {
+                    HttpLoggingInterceptor {
+                        Timber.tag(tag).i(it)
+                    }.apply {
                         level = HttpLoggingInterceptor.Level.BODY
                     }
                 )
+                .addNetworkInterceptor(StethoInterceptor())
                 .build()
         }
 
@@ -157,9 +157,8 @@ class LauncherApp : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        AndroidThreeTen.init(this@LauncherApp)
-
         setupTimber()
+        setupStetho()
         setupCalligraphy()
         setupKoin()
     }
@@ -172,6 +171,10 @@ class LauncherApp : Application() {
         }
     }
 
+    private fun setupStetho() {
+        Stetho.initializeWithDefaults(this@LauncherApp)
+    }
+
     private fun setupCalligraphy() {
         ViewPump.init(
             ViewPump.builder()
@@ -187,7 +190,7 @@ class LauncherApp : Application() {
 
     private fun setupKoin() {
         startKoin {
-            androidLogger()
+            androidLogger(Level.ERROR)
             androidContext(this@LauncherApp)
             modules(
                 appModule,
@@ -200,16 +203,13 @@ class LauncherApp : Application() {
     }
 }
 
-@GlideModule
-class LauncherAppGlideModule : AppGlideModule()
-
 internal class CrashlyticsTree : Timber.Tree() {
 
     override fun isLoggable(tag: String?, priority: Int): Boolean =
         priority == Log.WARN || priority == Log.ERROR || priority == Log.ASSERT
 
     override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
-        FirebaseCrashlytics.getInstance().apply {
+        Firebase.crashlytics.apply {
             log(message)
 
             throwable?.let {

app/src/main/java/com/sherepenko/android/launchiteasy/api/json/deserialization/CurrentWeatherResponseDeserializer.kt

@@ -13,7 +13,7 @@ import com.sherepenko.android.launchiteasy.data.TemperatureItem
 import com.sherepenko.android.launchiteasy.data.WeatherItem
 import com.sherepenko.android.launchiteasy.data.WindItem
 import java.io.IOException
-import org.threeten.bp.Instant
+import java.time.Instant
 
 class CurrentWeatherResponseDeserializer : JsonDeserializer<CurrentWeatherResponse>() {
 

app/src/main/java/com/sherepenko/android/launchiteasy/api/json/deserialization/WeatherForecastResponseDeserializer.kt

@@ -13,7 +13,7 @@ import com.sherepenko.android.launchiteasy.data.LocationItem
 import com.sherepenko.android.launchiteasy.data.TemperatureItem
 import com.sherepenko.android.launchiteasy.data.WindItem
 import java.io.IOException
-import org.threeten.bp.Instant
+import java.time.Instant
 
 class WeatherForecastResponseDeserializer : JsonDeserializer<WeatherForecastResponse>() {
 

app/src/main/java/com/sherepenko/android/launchiteasy/data/AppItem.kt

@@ -3,7 +3,7 @@ package com.sherepenko.android.launchiteasy.data
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.Instant
+import java.time.Instant
 
 @Entity(tableName = "applications")
 data class AppItem(

app/src/main/java/com/sherepenko/android/launchiteasy/data/ForecastItem.kt

@@ -5,7 +5,7 @@ import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.Instant
+import java.time.Instant
 
 @Entity(
     tableName = "weather_forecasts",

app/src/main/java/com/sherepenko/android/launchiteasy/data/WeatherItem.kt

@@ -5,7 +5,7 @@ import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.Instant
+import java.time.Instant
 
 @Entity(
     tableName = "current_weather",