diff --git a/app/build.gradle b/app/build.gradle index 59ca28f..791dbd7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,15 +6,15 @@ plugins { } android { - compileSdk 31 - buildToolsVersion "31.0.0" + compileSdk 32 + buildToolsVersion "33.0.0" defaultConfig { applicationId "com.pixelized.biblib" minSdk 23 - targetSdk 31 + targetSdk 32 versionCode generateVersionCode() - versionName "0.1.2" + versionName "0.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -61,7 +61,6 @@ android { kotlinOptions { jvmTarget = '1.8' - useIR = true } buildFeatures { @@ -69,7 +68,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.1.0' + kotlinCompilerExtensionVersion '1.2.0-rc01' } packagingOptions { @@ -81,20 +80,23 @@ android { dependencies { // Android core - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.6.0' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1" implementation 'androidx.activity:activity-compose:1.4.0' // 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.runtime:runtime-livedata:1.1.1" implementation "androidx.compose.ui:ui-tooling-preview: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 implementation "androidx.compose.material:material-icons-core: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" // 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. - 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 implementation 'com.squareup.retrofit2:retrofit: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 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-ktx:2.4.2" kapt "androidx.room:room-compiler:2.4.2" - implementation "androidx.paging:paging-compose:1.0.0-alpha14" } static def generateVersionCode() { diff --git a/app/src/main/java/com/pixelized/biblib/ui/scaffold/BottomDetailScaffold.kt b/app/src/main/java/com/pixelized/biblib/ui/scaffold/BottomDetailScaffold.kt index c6edf47..5f3166d 100644 --- a/app/src/main/java/com/pixelized/biblib/ui/scaffold/BottomDetailScaffold.kt +++ b/app/src/main/java/com/pixelized/biblib/ui/scaffold/BottomDetailScaffold.kt @@ -77,7 +77,8 @@ class BottomDetailStateController constructor( scope.launch { when (val book = viewModel.getDetail(id)) { 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 -> { bookDetail.value = book.value diff --git a/build.gradle b/build.gradle index f9f287d..7bc388f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext { - kotlin_version = "1.6.10" - } repositories { google() @@ -10,8 +7,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:7.2.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" classpath "com.google.dagger:hilt-android-gradle-plugin:2.40.5" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4aa9c5..61ef5dd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Apr 28 21:29:33 CEST 2021 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 zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME