From ea37d3128df933030129a21aa818ce7c3d0eef21 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 14:13:52 +0800 Subject: [PATCH 1/8] printStackTrace --- .../kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index dd400e025..f189bfed5 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -82,10 +82,9 @@ class MainHomeViewModel : BaseViewModel() { putRepoListIntoDb(google.await(), microsoft.await()) } catch (e: Exception) { - e.message?.let { - _title.value = it - } io.goooler.demoapp.common.R.string.common_request_failed.showToast() + _title.value = e.message.orEmpty() + e.printStackTrace() } } } From e8607bf321660ed997ce2672dea551e44ddd3e35 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 18:55:38 +0800 Subject: [PATCH 2/8] print error in querying db --- .../kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index f189bfed5..4f3f93e4d 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -71,7 +71,9 @@ class MainHomeViewModel : BaseViewModel() { val microsoft = async(SupervisorJob()) { repository.getRepoListFromDb("microsoft") } _title.value = processList(google.await(), microsoft.await()) - } catch (_: Exception) { + } catch (e: Exception) { + _title.value = e.message.orEmpty() + e.printStackTrace() } try { @@ -82,7 +84,6 @@ class MainHomeViewModel : BaseViewModel() { putRepoListIntoDb(google.await(), microsoft.await()) } catch (e: Exception) { - io.goooler.demoapp.common.R.string.common_request_failed.showToast() _title.value = e.message.orEmpty() e.printStackTrace() } From e8edbfce80a06031288c57b6fe747b2c194db793 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 19:23:57 +0800 Subject: [PATCH 3/8] Replace moshi-ir with ksp --- biz/detail/build.gradle.kts | 3 ++- biz/main/build.gradle.kts | 2 +- build.gradle.kts | 1 - common/build.gradle.kts | 4 +++- gradle/libs.versions.toml | 5 +++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/biz/detail/build.gradle.kts b/biz/detail/build.gradle.kts index f687f6a87..8aa6d98e3 100644 --- a/biz/detail/build.gradle.kts +++ b/biz/detail/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) - alias(libs.plugins.moshiX) + alias(libs.plugins.ksp) } android { @@ -17,4 +17,5 @@ dependencies { implementation(libs.bundles.accompanist) implementation(libs.square.moshi) + ksp(libs.square.moshi.compiler) } diff --git a/biz/main/build.gradle.kts b/biz/main/build.gradle.kts index 15ac66db0..52853f78e 100644 --- a/biz/main/build.gradle.kts +++ b/biz/main/build.gradle.kts @@ -3,7 +3,6 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.kapt) alias(libs.plugins.ksp) - alias(libs.plugins.moshiX) } android { @@ -25,4 +24,5 @@ dependencies { ksp(libs.androidX.room.compiler) implementation(libs.square.moshi) + ksp(libs.square.moshi.compiler) } diff --git a/build.gradle.kts b/build.gradle.kts index b78df6cd8..0355248ef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,6 @@ plugins { alias(libs.plugins.ksp) apply false alias(libs.plugins.kotlinter) apply false alias(libs.plugins.detekt) apply false - alias(libs.plugins.moshiX) apply false } allprojects { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 9b74914a1..2637e4ae3 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -3,7 +3,6 @@ plugins { alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.kapt) alias(libs.plugins.ksp) - alias(libs.plugins.moshiX) } android { @@ -35,7 +34,10 @@ dependencies { ksp(libs.androidX.room.compiler) implementation(libs.bundles.coil) + implementation(libs.square.moshi) + ksp(libs.square.moshi.compiler) + implementation(libs.square.retrofit.moshi) debugImplementation(libs.chucker.debug) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33fb83060..93d1f1dab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,6 +19,7 @@ glide = "4.13.2" kotlin = "1.7.10" square-okHttp = "4.10.0" square-retrofit = "2.9.0" +square-moshi = "1.14.0" srl = "2.0.5" support = "28.0.0" @@ -28,7 +29,6 @@ android-library = { id = "com.android.library", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } ksp = "com.google.devtools.ksp:1.7.10-1.0.6" -moshiX = "dev.zacsweers.moshix:0.18.3" kotlinter = "org.jmailen.kotlinter:3.12.0" detekt = "io.gitlab.arturbosch.detekt:1.21.0" @@ -67,7 +67,8 @@ androidX-viewPager2 = "androidx.viewpager2:viewpager2:1.0.0" androidX-webKit = "androidx.webkit:webkit:1.5.0" square-leakCanary = "com.squareup.leakcanary:leakcanary-android:2.9.1" -square-moshi = "com.squareup.moshi:moshi:1.14.0" +square-moshi = { module = "com.squareup.moshi:moshi", version.ref = "square-moshi" } +square-moshi-compiler = { module = "com.squareup.moshi:moshi", version.ref = "square-moshi" } square-okHttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "square-okHttp" } square-okHttp-LogInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "square-okHttp" } square-okHttp-mock = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "square-okHttp" } From a8e337f059ab3e5c44dd517d61ce57591e54987c Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 21:25:31 +0800 Subject: [PATCH 4/8] Fix lint --- .../main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 4f3f93e4d..5bbeac607 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -2,7 +2,6 @@ package io.goooler.demoapp.main.vm import androidx.lifecycle.viewModelScope import io.goooler.demoapp.base.core.BaseViewModel -import io.goooler.demoapp.common.util.showToast import io.goooler.demoapp.main.bean.MainRepoListBean import io.goooler.demoapp.main.repository.MainCommonRepository import java.util.concurrent.CancellationException From 2f2132b64aa8b2bf50fc6ff6eddd4e0e20301b49 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 21:51:36 +0800 Subject: [PATCH 5/8] Correct compiler's id --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93d1f1dab..b8590bf92 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,7 @@ androidX-webKit = "androidx.webkit:webkit:1.5.0" square-leakCanary = "com.squareup.leakcanary:leakcanary-android:2.9.1" square-moshi = { module = "com.squareup.moshi:moshi", version.ref = "square-moshi" } -square-moshi-compiler = { module = "com.squareup.moshi:moshi", version.ref = "square-moshi" } +square-moshi-compiler = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "square-moshi" } square-okHttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "square-okHttp" } square-okHttp-LogInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "square-okHttp" } square-okHttp-mock = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "square-okHttp" } From 4f7273e33c50da27400d3bf3964ed8f5acb98a79 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 21:54:30 +0800 Subject: [PATCH 6/8] Revert "print error in querying db" This reverts commit e8607bf321660ed997ce2672dea551e44ddd3e35. --- .../kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 5bbeac607..86bd74755 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -70,9 +70,7 @@ class MainHomeViewModel : BaseViewModel() { val microsoft = async(SupervisorJob()) { repository.getRepoListFromDb("microsoft") } _title.value = processList(google.await(), microsoft.await()) - } catch (e: Exception) { - _title.value = e.message.orEmpty() - e.printStackTrace() + } catch (_: Exception) { } try { @@ -83,6 +81,7 @@ class MainHomeViewModel : BaseViewModel() { putRepoListIntoDb(google.await(), microsoft.await()) } catch (e: Exception) { + io.goooler.demoapp.common.R.string.common_request_failed.showToast() _title.value = e.message.orEmpty() e.printStackTrace() } From 54f7f27b8f7b647f9e549049b17aade5efc08c67 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 21:54:30 +0800 Subject: [PATCH 7/8] Revert "printStackTrace" This reverts commit ea37d3128df933030129a21aa818ce7c3d0eef21. --- .../kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 86bd74755..0e821ff10 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -81,9 +81,10 @@ class MainHomeViewModel : BaseViewModel() { putRepoListIntoDb(google.await(), microsoft.await()) } catch (e: Exception) { + e.message?.let { + _title.value = it + } io.goooler.demoapp.common.R.string.common_request_failed.showToast() - _title.value = e.message.orEmpty() - e.printStackTrace() } } } From 6dea06836c749808747133ba5b886a2f78d46acd Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 15 Sep 2022 21:55:38 +0800 Subject: [PATCH 8/8] Revert "Fix lint" This reverts commit a8e337f059ab3e5c44dd517d61ce57591e54987c. --- .../main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt index 0e821ff10..dd400e025 100644 --- a/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt +++ b/biz/main/src/main/kotlin/io/goooler/demoapp/main/vm/MainHomeViewModel.kt @@ -2,6 +2,7 @@ package io.goooler.demoapp.main.vm import androidx.lifecycle.viewModelScope import io.goooler.demoapp.base.core.BaseViewModel +import io.goooler.demoapp.common.util.showToast import io.goooler.demoapp.main.bean.MainRepoListBean import io.goooler.demoapp.main.repository.MainCommonRepository import java.util.concurrent.CancellationException