release/2.0.3

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: Checkout the code
         uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Run ktlint
         run: ./gradlew ktlint
   tests:
@@ -31,9 +31,9 @@ jobs:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
         run: |
           echo "${GOOGLE_SERVICES_JSON}" | base64 --decode > app/google-services.json
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Tests
         run: ./gradlew test

.github/workflows/release.yml

@@ -20,10 +20,10 @@ jobs:
           GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
         run: |
           echo "${GOOGLE_SERVICES_JSON}" | base64 --decode > app/google-services.json
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Assemble release
         env:
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}

app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlinx-serialization'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
@@ -33,17 +33,15 @@ def getGitSha = { ->
 }
 
 android {
+
     compileSdkVersion 30
-    androidExtensions {
-        experimental = true
-    }
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "fi.kroon.vadret"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 29
-        versionName "2.0.2"
+        versionCode 30
+        versionName "2.0.3"
         vectorDrawables.useSupportLibrary = true
         flavorDimensions "default"
         testInstrumentationRunner "androidx.top.runner.AndroidJUnitRunner"
@@ -116,11 +114,14 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+    buildFeatures {
+        viewBinding true
     }
 }
 
@@ -132,39 +133,39 @@ dependencies {
 
     def APPCOMPAT_VERSION = "1.2.0"
     def ASSERTJ_VERSION = "3.14.0"
-    def COIL_VERSION = "0.13.0"
+    def COIL_VERSION = "1.1.1"
     def COMMONS_CSV_VERSION = "1.7"
-    def CONSTRAINT_LAYOUT_VERSION = "2.0.2"
-    def CORBIND_VERSION = "1.4.0"
+    def CONSTRAINT_LAYOUT_VERSION = "2.0.4"
+    def CORBIND_VERSION = "1.5.0"
     def CORE_KTX_VERSION = "1.3.2"
-    def COROUTINES_VERSION = "1.4.2"
-    def DAGGER_VERSION = "2.30.1"
+    def COROUTINES_VERSION = "1.4.3"
+    def DAGGER_VERSION = "2.33"
     def EITHER_VERSION = "1.2.0"
-    def FRAGMENT_VERSION = "1.3.0-beta01"
+    def FRAGMENT_VERSION = "1.3.2"
     def JUNIT_VERSION = "4.13"
-    def KOTLIN_STDLIB_VERSION = "1.4.10"
-    def KOTLINX_SERIALIZATION = "1.0.1"
-    def KTLINT_VERSION = "0.40.0"
-    def MATERIAL_VERSION = "1.2.1"
+    def KOTLIN_STDLIB_VERSION = "1.4.32"
+    def KOTLINX_SERIALIZATION = "1.1.0"
+    def KTLINT_VERSION = "0.41.0"
+    def MATERIAL_VERSION = "1.3.0"
     def MOCKITO_CORE_VERSION = "3.1.0"
     def MOSHI_VERSION = "1.9.2"
-    def NAVIGATION_VERSION = "2.3.2"
+    def NAVIGATION_VERSION = "2.3.4"
     def OKHTTP_VERSION = "4.2.2"
     def OKIO_VERSION = "2.6.0"
-    def OSMDROID_VERSION = "6.1.2"
-    def PERMISSIONS_DISPATCHER_VERSION = "4.7.0"
+    def OSMDROID_VERSION = "6.1.10"
+    def PERMISSIONS_DISPATCHER_VERSION = "4.8.0"
     def PREFERENCE_VERSION = "1.1.1"
     def RETROFIT_VERSION = "2.9.0"
-    def ROOM_VERSION = "2.2.5"
+    def ROOM_VERSION = "2.2.6"
     def RXANDROID_VERSION = "2.1.1"
     def RXBINDING_VERSION = "3.1.0"
     def RXJAVA_VERSION = "2.2.19"
     def RXKOTLIN_VERSION = "2.4.0"
     def RXK_PREFS_VERSION = "1.2.5"
     def THREETEN_ABP_VERSION = "1.2.1"
-    def THREETEN_BP_VERSION = "1.4.0"
+    def THREETEN_BP_VERSION = "1.5.0"
     def TIMBER_VERSION = "4.7.1"
-    def LIFECYCLE_VERSION = "2.2.0"
+    def LIFECYCLE_VERSION = "2.3.0"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
@@ -181,7 +182,7 @@ dependencies {
     // Lifecycle
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$LIFECYCLE_VERSION"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$LIFECYCLE_VERSION"
-    kapt "androidx.lifecycle:lifecycle-compiler:$LIFECYCLE_VERSION"
+    kapt "androidx.lifecycle:lifecycle-common-java8:$LIFECYCLE_VERSION"
 
     // Coroutines
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${COROUTINES_VERSION}"
@@ -231,7 +232,7 @@ dependencies {
     implementation "com.afollestad:rxkprefs:${RXK_PREFS_VERSION}"
     implementation "io.coil-kt:coil:${COIL_VERSION}"
     implementation "org.apache.commons:commons-csv:${COMMONS_CSV_VERSION}"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${KOTLIN_STDLIB_VERSION}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${KOTLIN_STDLIB_VERSION}"
     implementation "org.osmdroid:osmdroid-android:${OSMDROID_VERSION}"
     implementation "io.github.sphrak:either:${EITHER_VERSION}"
     implementation "org.permissionsdispatcher:permissionsdispatcher:${PERMISSIONS_DISPATCHER_VERSION}"
@@ -242,7 +243,7 @@ dependencies {
     testImplementation "org.threeten:threetenbp:${THREETEN_BP_VERSION}"
 
     // Debugging, Testing, Linting, Analytics
-    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.5"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.6"
     googleImplementation platform('com.google.firebase:firebase-bom:26.0.0')
     googleImplementation 'com.google.firebase:firebase-crashlytics-ktx'
     implementation "com.jakewharton.timber:timber:${TIMBER_VERSION}"

app/src/main/java/fi/kroon/vadret/data/autocomplete/model/AutoCompleteItem.kt

@@ -1,7 +1,7 @@
 package fi.kroon.vadret.data.autocomplete.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class AutoCompleteItem(

app/src/main/java/fi/kroon/vadret/data/district/model/DistrictOptionEntity.kt

@@ -4,7 +4,7 @@ import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.DatabaseView
 import fi.kroon.vadret.presentation.warning.filter.model.IFilterable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @DatabaseView(

app/src/main/java/fi/kroon/vadret/data/feedsource/model/FeedSourceOptionEntity.kt

@@ -4,7 +4,7 @@ import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.DatabaseView
 import fi.kroon.vadret.presentation.warning.filter.model.IFilterable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @DatabaseView(

app/src/main/java/fi/kroon/vadret/data/nominatim/model/Address.kt

@@ -3,7 +3,7 @@ package fi.kroon.vadret.data.nominatim.model
 import android.os.Parcelable
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonClass(generateAdapter = true)

app/src/main/java/fi/kroon/vadret/data/nominatim/model/Locality.kt

@@ -3,7 +3,7 @@ package fi.kroon.vadret.data.nominatim.model
 import android.os.Parcelable
 import androidx.annotation.StringRes
 import fi.kroon.vadret.R
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class Locality(

app/src/main/java/fi/kroon/vadret/data/nominatim/model/Nominatim.kt

@@ -3,7 +3,7 @@ package fi.kroon.vadret.data.nominatim.model
 import android.os.Parcelable
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonClass(generateAdapter = true)

app/src/main/java/fi/kroon/vadret/data/nominatim/model/NominatimList.kt

@@ -1,7 +1,7 @@
 package fi.kroon.vadret.data.nominatim.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class NominatimList(

app/src/main/java/fi/kroon/vadret/data/weatherforecast/model/WeatherOut.kt

@@ -4,7 +4,7 @@ import android.os.Parcelable
 import fi.kroon.vadret.util.PMP3G_CATEGORY
 import fi.kroon.vadret.util.POINT_GEOTYPE
 import fi.kroon.vadret.util.SMHI_BASE_API_VERSION
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class WeatherOut(

app/src/main/java/fi/kroon/vadret/presentation/aboutapp/AboutAppFragment.kt

@@ -1,20 +1,23 @@
 package fi.kroon.vadret.presentation.aboutapp
 
 import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
-import fi.kroon.vadret.R
+import fi.kroon.vadret.databinding.AboutAppFragmentBinding
 import fi.kroon.vadret.presentation.aboutapp.di.AboutAppComponent
 import fi.kroon.vadret.presentation.aboutapp.di.DaggerAboutAppComponent
 import fi.kroon.vadret.util.extension.lazyAndroid
-import kotlinx.android.synthetic.main.about_app_fragment.*
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 
-@ExperimentalCoroutinesApi
-class AboutAppFragment : Fragment(R.layout.about_app_fragment) {
+class AboutAppFragment : Fragment() {
+
+    private var _binding: AboutAppFragmentBinding? = null
+    private val binding: AboutAppFragmentBinding get() = _binding!!
 
     private lateinit var aboutAppFragmentPagerAdapter: AboutAppFragmentPagerAdapter
 
@@ -28,36 +31,41 @@ class AboutAppFragment : Fragment(R.layout.about_app_fragment) {
         component.provideViewModel()
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = AboutAppFragmentBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-        lifecycleScope
-            .launch {
-                viewModel
-                    .viewState
-                    .collect(::render)
-            }
+        viewModel
+            .viewState
+            .onEach(::render)
+            .launchIn(viewLifecycleOwner.lifecycleScope)
 
         setupRecyclerView()
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         Timber.d("ON VIEW DESTROY")
-        aboutAppViewPager?.apply {
-            adapter = null
-        }
+        binding.aboutAppViewPager.adapter = null
+        _binding = null
     }
 
     private fun setupRecyclerView() {
         aboutAppFragmentPagerAdapter = AboutAppFragmentPagerAdapter(
             childFragmentManager,
             requireContext()
         )
-        aboutAppViewPager?.adapter = aboutAppFragmentPagerAdapter
-
-        aboutAppTabLayout?.apply {
-            setupWithViewPager(aboutAppViewPager)
+        binding.apply {
+            aboutAppViewPager.adapter = aboutAppFragmentPagerAdapter
+            aboutAppTabLayout.setupWithViewPager(aboutAppViewPager)
         }
     }
 

app/src/main/java/fi/kroon/vadret/presentation/aboutapp/AboutAppView.kt

@@ -1,7 +1,7 @@
 package fi.kroon.vadret.presentation.aboutapp
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 object AboutAppView {
 

app/src/main/java/fi/kroon/vadret/presentation/aboutapp/AboutAppViewModel.kt

@@ -2,14 +2,12 @@ package fi.kroon.vadret.presentation.aboutapp
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-@ExperimentalCoroutinesApi
 class AboutAppViewModel @Inject constructor(
     private val state: MutableSharedFlow<AboutAppView.State>,
     private var stateModel: AboutAppView.State,