Henry-Hiles/QWeather
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update deps

Browse source
This commit is contained in:
Henry Hiles 2023-12-23 07:56:16 -05:00
parent 236995b5f7
commit 1737741d77
6 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
app/build.gradle.kts
View file

@ -1,13 +1,13 @@
plugins { plugins {
kotlin("plugin.serialization") version "1.9.21"
id("com.android.application") id("com.android.application")
id("org.jetbrains.kotlin.android") id("org.jetbrains.kotlin.android")
id("kotlin-kapt") id("kotlin-kapt")
kotlin("plugin.serialization") version "1.8.10"
} }
android { android {
namespace = "com.henryhiles.qweather" namespace = "com.henryhiles.qweather"
compileSdk = 33 compileSdk = 34
signingConfigs { signingConfigs {
create("release") { create("release") {
@ -21,7 +21,7 @@ android {
defaultConfig { defaultConfig {
applicationId = "com.henryhiles.qweather" applicationId = "com.henryhiles.qweather"
minSdk = 30 minSdk = 30
targetSdk = 33 targetSdk = 34
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
@ -59,9 +59,9 @@ android {
compose = true compose = true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = "1.4.3" kotlinCompilerExtensionVersion = "1.5.5"
} }
packagingOptions { packaging {
resources { resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}" excludes += "/META-INF/{AL2.0,LGPL2.1}"
} }
@ -69,23 +69,23 @@ android {
} }
dependencies { dependencies {
implementation("androidx.core:core-ktx:1.10.0") implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.compose.material3:material3:1.1.0-rc01") implementation("androidx.compose.material3:material3:1.1.2")
implementation("androidx.activity:activity-compose:1.7.1") implementation("androidx.activity:activity-compose:1.8.2")
implementation("androidx.core:core-ktx:1.10.0") implementation("androidx.core:core-ktx:1.12.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3") implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
// Lifecycle // Lifecycle
val lifecycleVersion = "2.6.1" val lifecycleVersion = "2.6.2"
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycleVersion")
// Compose // Compose
val composeVersion = "1.4.0" val composeVersion = "1.5.4"
implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion") implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
implementation("androidx.compose.ui:ui:$composeVersion") implementation("androidx.compose.ui:ui:$composeVersion")
@ -93,16 +93,15 @@ dependencies {
debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion") debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
// Voyager // Voyager
val voyagerVersion = "1.0.0-rc04" val voyagerVersion = "1.0.0"
implementation("cafe.adriel.voyager:voyager-navigator:$voyagerVersion") implementation("cafe.adriel.voyager:voyager-navigator:$voyagerVersion")
implementation("cafe.adriel.voyager:voyager-tab-navigator:$voyagerVersion") implementation("cafe.adriel.voyager:voyager-tab-navigator:$voyagerVersion")
implementation("cafe.adriel.voyager:voyager-transitions:$voyagerVersion") implementation("cafe.adriel.voyager:voyager-transitions:$voyagerVersion")
implementation("cafe.adriel.voyager:voyager-androidx:$voyagerVersion")
implementation("cafe.adriel.voyager:voyager-koin:$voyagerVersion") implementation("cafe.adriel.voyager:voyager-koin:$voyagerVersion")
// Koin // Koin
val koinVersion = "3.2.0" val koinVersion = "3.5.3"
implementation("io.insert-koin:koin-core:$koinVersion") implementation("io.insert-koin:koin-core:$koinVersion")
implementation("io.insert-koin:koin-android:$koinVersion") implementation("io.insert-koin:koin-android:$koinVersion")

4
app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/DailyWeatherScreenModel.kt
View file

@ -4,7 +4,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.model.coroutineScope import cafe.adriel.voyager.core.model.screenModelScope
import com.henryhiles.qweather.domain.repository.WeatherRepository import com.henryhiles.qweather.domain.repository.WeatherRepository
import com.henryhiles.qweather.domain.util.Resource import com.henryhiles.qweather.domain.util.Resource
import com.henryhiles.qweather.domain.weather.DailyWeatherData import com.henryhiles.qweather.domain.weather.DailyWeatherData
@ -26,7 +26,7 @@ class DailyWeatherScreenModel(
fun loadWeatherInfo(cache: Boolean = true) { fun loadWeatherInfo(cache: Boolean = true) {
val location = locationPreferenceManager.locations[locationPreferenceManager.selectedIndex] val location = locationPreferenceManager.locations[locationPreferenceManager.selectedIndex]
coroutineScope.launch { screenModelScope.launch {
state = state.copy(isLoading = true, error = null) state = state.copy(isLoading = true, error = null)
state = when (val result = repository.getDailyWeatherData( state = when (val result = repository.getDailyWeatherData(
lat = location.latitude, lat = location.latitude,

4
app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/HourlyWeatherScreenModel.kt
View file

@ -4,7 +4,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.model.coroutineScope import cafe.adriel.voyager.core.model.screenModelScope
import com.henryhiles.qweather.domain.repository.WeatherRepository import com.henryhiles.qweather.domain.repository.WeatherRepository
import com.henryhiles.qweather.domain.util.Resource import com.henryhiles.qweather.domain.util.Resource
import com.henryhiles.qweather.domain.weather.HourlyWeatherInfo import com.henryhiles.qweather.domain.weather.HourlyWeatherInfo
@ -26,7 +26,7 @@ class HourlyWeatherScreenModel(
fun loadWeatherInfo(cache: Boolean = true) { fun loadWeatherInfo(cache: Boolean = true) {
val location = locationPreferenceManager.locations[locationPreferenceManager.selectedIndex] val location = locationPreferenceManager.locations[locationPreferenceManager.selectedIndex]
coroutineScope.launch { screenModelScope.launch {
state = state.copy(isLoading = true, error = null, selected = null) state = state.copy(isLoading = true, error = null, selected = null)
state = when (val result = state = when (val result =
repository.getHourlyWeatherData( repository.getHourlyWeatherData(

4
app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/LocationPickerScreenModel.kt
View file

@ -5,7 +5,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.model.coroutineScope import cafe.adriel.voyager.core.model.screenModelScope
import com.henryhiles.qweather.domain.geocoding.GeocodingData import com.henryhiles.qweather.domain.geocoding.GeocodingData
import com.henryhiles.qweather.domain.manager.BasePreferenceManager import com.henryhiles.qweather.domain.manager.BasePreferenceManager
import com.henryhiles.qweather.domain.repository.GeocodingRepository import com.henryhiles.qweather.domain.repository.GeocodingRepository
@ -35,7 +35,7 @@ class LocationPickerScreenModel(
private set private set
fun loadGeolocationInfo(location: String) { fun loadGeolocationInfo(location: String) {
coroutineScope.launch { screenModelScope.launch {
state = state.copy(isLoading = true, error = null) state = state.copy(isLoading = true, error = null)
state = when (val result = state = when (val result =

6
build.gradle.kts
View file

@ -1,5 +1,5 @@
plugins { plugins {
id("com.android.application") version "7.4.1" apply false id("com.android.application") version "8.2.0" apply false
id("com.android.library") version "7.4.1" apply false id("com.android.library") version "8.2.0" apply false
id("org.jetbrains.kotlin.android") version "1.8.10" apply false id("org.jetbrains.kotlin.android") version "1.9.20" apply false
} }

6
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sun Jun 26 11:26:31 CEST 2022 #Fri Dec 22 14:56:20 GMT 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists