Update dependencies & application version.

This commit is contained in:
Thomas Andres Gomez 2022-06-21 17:47:34 +02:00
parent 4f3fabc4d6
commit 52cfe78b6e
4 changed files with 20 additions and 21 deletions

View file

@ -6,15 +6,15 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk 32
buildToolsVersion "31.0.0" buildToolsVersion "33.0.0"
defaultConfig { defaultConfig {
applicationId "com.pixelized.biblib" applicationId "com.pixelized.biblib"
minSdk 23 minSdk 23
targetSdk 31 targetSdk 32
versionCode generateVersionCode() versionCode generateVersionCode()
versionName "0.1.2" versionName "0.1.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@ -61,7 +61,6 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '1.8'
useIR = true
} }
buildFeatures { buildFeatures {
@ -69,7 +68,7 @@ android {
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion '1.1.0' kotlinCompilerExtensionVersion '1.2.0-rc01'
} }
packagingOptions { packagingOptions {
@ -81,20 +80,23 @@ android {
dependencies { dependencies {
// Android core // Android core
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.0' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
implementation 'androidx.activity:activity-compose:1.4.0' implementation 'androidx.activity:activity-compose:1.4.0'
// Android Compose // Android Compose
implementation "androidx.compose.ui:ui:1.2.0-beta01" implementation "androidx.compose.ui:ui:1.2.0-rc01"
implementation "androidx.compose.material:material:1.1.1" implementation "androidx.compose.material:material:1.1.1"
implementation "androidx.compose.runtime:runtime-livedata:1.1.1" implementation "androidx.compose.runtime:runtime-livedata:1.1.1"
implementation "androidx.compose.ui:ui-tooling-preview:1.1.1" implementation "androidx.compose.ui:ui-tooling-preview:1.1.1"
debugImplementation "androidx.compose.ui:ui-tooling:1.1.1" debugImplementation "androidx.compose.ui:ui-tooling:1.1.1"
// Paging
implementation "androidx.paging:paging-compose:1.0.0-alpha15"
// Material design icons // Material design icons
implementation "androidx.compose.material:material-icons-core:1.1.1" implementation "androidx.compose.material:material-icons-core:1.1.1"
implementation "androidx.compose.material:material-icons-extended:1.1.1" implementation "androidx.compose.material:material-icons-extended:1.1.1"
@ -114,15 +116,15 @@ dependencies {
implementation "androidx.navigation:navigation-compose:2.4.2" implementation "androidx.navigation:navigation-compose:2.4.2"
// Splash Screen support prior to Android 12 // Splash Screen support prior to Android 12
implementation "androidx.core:core-splashscreen:1.0.0-beta02" implementation "androidx.core:core-splashscreen:1.0.0-rc01"
// Google sign in. // Google sign in.
implementation "com.google.android.gms:play-services-auth:20.1.0" implementation "com.google.android.gms:play-services-auth:20.2.0"
// RetroFit & Gson for webservice call // RetroFit & Gson for webservice call
implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.google.code.gson:gson:2.8.8' implementation 'com.google.code.gson:gson:2.8.9'
// Logging Network Calls // Logging Network Calls
implementation "com.squareup.okhttp3:logging-interceptor:4.8.1" implementation "com.squareup.okhttp3:logging-interceptor:4.8.1"
@ -131,7 +133,6 @@ dependencies {
implementation "androidx.room:room-runtime:2.4.2" implementation "androidx.room:room-runtime:2.4.2"
implementation "androidx.room:room-ktx:2.4.2" implementation "androidx.room:room-ktx:2.4.2"
kapt "androidx.room:room-compiler:2.4.2" kapt "androidx.room:room-compiler:2.4.2"
implementation "androidx.paging:paging-compose:1.0.0-alpha14"
} }
static def generateVersionCode() { static def generateVersionCode() {

View file

@ -77,7 +77,8 @@ class BottomDetailStateController constructor(
scope.launch { scope.launch {
when (val book = viewModel.getDetail(id)) { when (val book = viewModel.getDetail(id)) {
is StateUio.Failure -> { is StateUio.Failure -> {
context.showToast(message = context.getString(R.string.error_generic)) val mes = book.exception.message ?: context.getString(R.string.error_generic)
context.showToast(message = mes)
} }
is StateUio.Success -> { is StateUio.Success -> {
bookDetail.value = book.value bookDetail.value = book.value

View file

@ -1,8 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext {
kotlin_version = "1.6.10"
}
repositories { repositories {
google() google()
@ -10,8 +7,8 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.3' classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.40.5" classpath "com.google.dagger:hilt-android-gradle-plugin:2.40.5"
} }
} }

View file

@ -1,6 +1,6 @@
#Wed Apr 28 21:29:33 CEST 2021 #Wed Apr 28 21:29:33 CEST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME