Chore: bump ktlint gradle plugin to 10.2.1, remove wildcard imports (#42)

.github/workflows/android_build.yml

@@ -33,39 +33,4 @@ jobs:
         run: ./gradlew test
 
       - name: Build Project
-        run: ./gradlew assemble
-
-  apk:
-    name: Generate APK
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Create Properties File
-        env:
-          API_KEY: ${{ secrets.APIKEY }}
-          ALGOLIA_API_KEY: ${{ secrets.ALGOLIAAPIKEY }}
-          ALGOLIA_APP_ID: ${{ secrets.ALGOLIAAPPID }}
-          ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME }}
-        run: |
-          touch local.properties
-          echo "API_KEY=$API_KEY" >> local.properties
-          echo "ALGOLIA_API_KEY=$ALGOLIA_API_KEY" >> local.properties
-          echo "ALGOLIA_APP_ID=$ALGOLIA_APP_ID" >> local.properties
-          echo "ALGOLIA_INDEX_NAME=$ALGOLIA_INDEX_NAME" >> local.properties
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-          cache: gradle
-      - name: Build debug APK
-        run: bash ./gradlew assembleDebug --stacktrace
-      - name: Upload APK
-        uses: actions/upload-artifact@v2
-        with:
-          name: app
-          path: app/build/outputs/apk/debug/app-debug.apk
+        run: ./gradlew assemble

.github/workflows/apk_release.yml

@@ -0,0 +1,45 @@
+name: Generate APK
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+ apk:
+  name: Generate APK
+  runs-on: ubuntu-latest
+
+  steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Create Properties File
+      env:
+        API_KEY: ${{ secrets.APIKEY }}
+        ALGOLIA_API_KEY: ${{ secrets.ALGOLIAAPIKEY }}
+        ALGOLIA_APP_ID: ${{ secrets.ALGOLIAAPPID }}
+        ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME }}
+      run: |
+        touch local.properties
+        echo "API_KEY=$API_KEY" >> local.properties
+        echo "ALGOLIA_API_KEY=$ALGOLIA_API_KEY" >> local.properties
+        echo "ALGOLIA_APP_ID=$ALGOLIA_APP_ID" >> local.properties
+        echo "ALGOLIA_INDEX_NAME=$ALGOLIA_INDEX_NAME" >> local.properties
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 11
+        cache: gradle
+    - name: Build debug APK
+      run: bash ./gradlew assembleDebug --stacktrace
+    - name: Upload APK
+      uses: actions/upload-artifact@v2
+      with:
+        name: app
+        path: app/build/outputs/apk/debug/app-debug.apk

app/src/main/java/com/mayokunadeniyi/instantweather/ui/forecast/ForecastFragment.kt

@@ -73,7 +73,6 @@ class ForecastFragment : BaseFragment(), ForecastOnClickListener {
                 weatherForecastAdapter.submitList(it)
                 binding.emptyListText.isVisible = it.isEmpty()
             }
-
         }
 
         binding.forecastSwipeRefresh.setOnRefreshListener {

app/src/main/java/com/mayokunadeniyi/instantweather/utils/BindingAdapter.kt

@@ -23,8 +23,8 @@ fun WeatherIconView.showIcon(condition: String?) {
 fun TextView.setTemperature(double: Double) {
     val context = this.context
     if (SharedPreferenceHelper.getInstance(context).getSelectedTemperatureUnit() == context.getString(
-        R.string.temp_unit_fahrenheit
-    )
+            R.string.temp_unit_fahrenheit
+        )
     )
         this.text = double.toString() + context.resources.getString(R.string.temp_symbol_fahrenheit)
     else

app/src/test/java/com/mayokunadeniyi/instantweather/data/source/repository/WeatherRepositoryTest.kt

@@ -1,22 +1,34 @@
 package com.mayokunadeniyi.instantweather.data.source.repository
 
-import com.mayokunadeniyi.instantweather.*
+import com.mayokunadeniyi.instantweather.MainCoroutineRule
 import com.mayokunadeniyi.instantweather.data.model.Weather
 import com.mayokunadeniyi.instantweather.data.model.WeatherForecast
 import com.mayokunadeniyi.instantweather.data.source.local.WeatherLocalDataSource
 import com.mayokunadeniyi.instantweather.data.source.remote.WeatherRemoteDataSource
+import com.mayokunadeniyi.instantweather.dummyLocation
+import com.mayokunadeniyi.instantweather.fakeDbWeatherEntity
+import com.mayokunadeniyi.instantweather.fakeDbWeatherForecast
+import com.mayokunadeniyi.instantweather.fakeNetworkWeather
+import com.mayokunadeniyi.instantweather.fakeNetworkWeatherForecast
+import com.mayokunadeniyi.instantweather.invalidDataException
+import com.mayokunadeniyi.instantweather.queryLocation
 import com.mayokunadeniyi.instantweather.utils.Result
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
-import org.hamcrest.CoreMatchers.*
+import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.CoreMatchers.notNullValue
+import org.hamcrest.CoreMatchers.nullValue
 import org.junit.Assert.assertThat
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.*
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.verifyNoMoreInteractions
+import org.mockito.Mockito.`when`
 import org.mockito.junit.MockitoJUnitRunner
 
 /**

app/src/test/java/com/mayokunadeniyi/instantweather/ui/forecast/ForecastFragmentViewModelTest.kt

@@ -1,8 +1,12 @@
 package com.mayokunadeniyi.instantweather.ui.forecast
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.mayokunadeniyi.instantweather.*
+import com.mayokunadeniyi.instantweather.MainCoroutineRule
+import com.mayokunadeniyi.instantweather.cityId
 import com.mayokunadeniyi.instantweather.data.source.repository.WeatherRepository
+import com.mayokunadeniyi.instantweather.fakeWeatherForecast
+import com.mayokunadeniyi.instantweather.getOrAwaitValue
+import com.mayokunadeniyi.instantweather.invalidDataException
 import com.mayokunadeniyi.instantweather.utils.Result
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
@@ -14,7 +18,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.*
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
 import org.mockito.junit.MockitoJUnitRunner
 
 /**

app/src/test/java/com/mayokunadeniyi/instantweather/ui/home/HomeFragmentViewModelTest.kt

@@ -2,8 +2,12 @@ package com.mayokunadeniyi.instantweather.ui.home
 
 import android.os.Build
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.mayokunadeniyi.instantweather.*
+import com.mayokunadeniyi.instantweather.MainCoroutineRule
 import com.mayokunadeniyi.instantweather.data.source.repository.WeatherRepository
+import com.mayokunadeniyi.instantweather.dummyLocation
+import com.mayokunadeniyi.instantweather.fakeWeather
+import com.mayokunadeniyi.instantweather.getOrAwaitValue
+import com.mayokunadeniyi.instantweather.invalidDataException
 import com.mayokunadeniyi.instantweather.utils.Result
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
@@ -14,7 +18,10 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mockito.*
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 

app/src/test/java/com/mayokunadeniyi/instantweather/ui/search/SearchFragmentViewModelTest.kt

@@ -1,8 +1,12 @@
 package com.mayokunadeniyi.instantweather.ui.search
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.mayokunadeniyi.instantweather.*
+import com.mayokunadeniyi.instantweather.MainCoroutineRule
 import com.mayokunadeniyi.instantweather.data.source.repository.WeatherRepository
+import com.mayokunadeniyi.instantweather.fakeWeather
+import com.mayokunadeniyi.instantweather.getOrAwaitValue
+import com.mayokunadeniyi.instantweather.invalidDataException
+import com.mayokunadeniyi.instantweather.queryLocation
 import com.mayokunadeniyi.instantweather.utils.Result
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
@@ -14,7 +18,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.*
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.Mockito.`when`
 import org.mockito.junit.MockitoJUnitRunner
 
 /**

build.gradle.kts

@@ -17,7 +17,7 @@ buildscript {
 }
 
 plugins {
-    id("org.jlleitschuh.gradle.ktlint") version ("9.3.0")
+    id("org.jlleitschuh.gradle.ktlint") version ("10.2.1")
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Nov 13 14:42:55 GMT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME