prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gradle version

Browse source
This commit is contained in:
Satindar Dhillon 2022-12-08 09:21:45 -08:00
parent ce3dccc7a1
commit 30ec4f71e8
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/Omnivore/app/build.gradle
View file

@ -68,7 +68,7 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = '1.2.0-alpha08'
kotlinCompilerExtensionVersion = '1.3.1'
}
packagingOptions {
resources {

2
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
View file

@ -268,7 +268,7 @@ class LoginViewModel @Inject constructor(
fun handleGoogleAuthTask(task: Task<GoogleSignInAccount>) {
val result = task?.getResult(ApiException::class.java)
val googleIdToken = result.idToken
val googleIdToken = result?.idToken ?: ""
// If token is missing then set the error message
if (googleIdToken == null) {

1
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
View file

@ -101,6 +101,7 @@ fun WelcomeScreenContent(viewModel: LoginViewModel) {
)
when (result) {
SnackbarResult.ActionPerformed -> viewModel.resetErrorMessage()
else -> {}
}
}

14
android/Omnivore/build.gradle
View file

@ -3,21 +3,19 @@ buildscript {
compose_version = '1.3.1'
lifecycle_version = '2.5.1'
hilt_version = '2.44.2'
gradle_plugin_version = '7.3.1'
}
dependencies {
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath 'com.android.tools.build:gradle:7.2.2'
classpath "com.android.tools.build:gradle:$gradle_plugin_version"
}
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.2.2' apply false
id 'com.android.library' version '7.2.2' apply false
id 'org.jetbrains.kotlin.android' version '1.6.20' apply false
// id 'com.android.application' version '7.2.2' apply false
// id 'com.android.library' version '7.2.2' apply false
// id 'org.jetbrains.kotlin.android' version '1.7.20-Beta' apply false
id 'com.android.application' version "$gradle_plugin_version" apply false
id 'com.android.library' version "$gradle_plugin_version" apply false
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
}
task clean(type: Delete) {