Merge pull request #6 from yml-org/feature/CM-1239-RenovateBotFix

AkYML · web-flow · commit 9a819c3a24e4 · 2023-03-30T12:27:27.000+05:30
Feature/cm 1239 renovate bot fix
diff --git a/.editorconfig b/.editorconfig
@@ -12,7 +12,7 @@ insert_final_newline = true
 
 [*.{java,kt,kts,scala,rs,xml,kt.spec,kts.spec}]
 indent_size = 4
-disabled_rules=no-wildcard-imports
+ktlint_disabled_rules=no-wildcard-imports
 
 [*.{kt,kts}]
 ktlint_code_style = ktlint_official
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,11 +1,17 @@
+import ytemplate.android.jacoco.addExclusion
+
 @Suppress("DSL_SCOPE_VIOLATION") // scope violation issue: work around suggested from: https://github.com/gradle/gradle/issues/22797
 plugins {
     id("ytemplate.android.application")
     id("ytemplate.android.application.jacoco")
     id("ytemplate.android.application.compose")
     id("ytemplate.android.hilt")
 }
-
+private val excludedFiles = mutableSetOf(
+    "**/ytemplate/android/MainActivity.*",
+    "**/ytemplate/android/YTemplate.*"
+)
+addExclusion(excludedFiles)
 android {
     namespace = "ytemplate.android"
     defaultConfig {
diff --git a/build-logic/src/main/java/conventions/FirebaseConventionPlugin.kt b/build-logic/src/main/java/conventions/FirebaseConventionPlugin.kt
@@ -19,4 +19,4 @@ class FirebaseConventionPlugin : Plugin<Project> {
             }
         }
     }
-}
+}
diff --git a/build-logic/src/main/java/conventions/HiltConventionPlugin.kt b/build-logic/src/main/java/conventions/HiltConventionPlugin.kt
@@ -32,5 +32,4 @@ class HiltConventionPlugin : Plugin<Project> {
 
         }
     }
-
-}
+}
diff --git a/build-logic/src/main/java/conventions/LibraryConventionPlugin.kt b/build-logic/src/main/java/conventions/LibraryConventionPlugin.kt
@@ -24,7 +24,7 @@ class LibraryConventionPlugin : Plugin<Project> {
                 apply(libs.findPlugin("android.library").get().get().pluginId)
                 apply(libs.findPlugin("kotlin.android").get().get().pluginId)
                 apply(libs.findPlugin("kotlin.serialization").get().get().pluginId)
-
+                apply(libs.findPlugin("ksp").get().get().pluginId)
             }
 
             extensions.configure<LibraryExtension> {
diff --git a/build-logic/src/main/java/conventions/ProjectJacocoConventionPlugin.kt b/build-logic/src/main/java/conventions/ProjectJacocoConventionPlugin.kt
@@ -15,6 +15,7 @@ import ytemplate.android.jacoco.jacoco
  *
  * @constructor Create empty Library jacoco convention plugin
  */
+@Suppress("UNCHECKED_CAST")
 class ProjectJacocoConventionPlugin : Plugin<Project> {
     private val project_level_limits = mutableMapOf(
         "instruction" to 0.0,
@@ -36,7 +37,6 @@ class ProjectJacocoConventionPlugin : Plugin<Project> {
 
     override fun apply(target: Project) {
         with(target) {
-            val libs = extensions.getByType<VersionCatalogsExtension>().named("versionCatalogLibs")
             with(pluginManager) {
                 apply("jacoco")
             }
diff --git a/build-logic/src/main/java/ytemplate/android/jacoco/Jacoco.kt b/build-logic/src/main/java/ytemplate/android/jacoco/Jacoco.kt
@@ -208,7 +208,7 @@ private fun Project.addTestCoverageTask(
         }
     }
 }
-
+@Suppress("UNCHECKED_CAST")
  fun Project.jacocoTestReport(taskName: String) {
     val reportDir = jacoco.reportsDirectory.asFile.get()
     val report = file("$reportDir/$taskName/${taskName}.xml")
@@ -235,7 +235,7 @@ private fun Project.addTestCoverageTask(
     }
 
 }
-
+@Suppress("UNCHECKED_CAST")
 fun File.extractTestCoverage(): Map<String, Double> {
     val xmlReader = XmlSlurper().apply {
         setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 buildscript {
     repositories {
         mavenCentral()
@@ -14,6 +16,7 @@ buildscript {
 plugins {
     alias(versionCatalogLibs.plugins.kotlin.serialization) apply false
     alias(versionCatalogLibs.plugins.hilt) apply false
+    alias(versionCatalogLibs.plugins.ksp) apply false
     alias(versionCatalogLibs.plugins.sonar)
     alias(versionCatalogLibs.plugins.dokka)
     alias(versionCatalogLibs.plugins.ktlint)
diff --git a/core/analytics/analyticsLib/build.gradle.kts b/core/analytics/analyticsLib/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 val test by tasks.getting(Test::class) {
     useJUnitPlatform { }
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -3,8 +3,8 @@ import ytemplate.android.jacoco.setModuleTestCoverageLimits
 
 plugins {
     id("ytemplate.android.library")
-    id("ytemplate.android.library.jacoco")
     id("ytemplate.android.hilt")
+    id("ytemplate.android.library.jacoco")
 }
 
 private val excludedFiles = mutableSetOf(
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -29,13 +29,20 @@ setModuleTestCoverageLimits(limits)
 
 android {
     namespace = "ytemplate.android.database"
+    defaultConfig {
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments["room.schemaLocation"] = "$projectDir/schemas"
+            }
+        }
+    }
 }
 
 dependencies {
     implementation(project(mapOf("path" to ":core:common")))
     // Room
     implementation(versionCatalogLibs.bundles.room)
-    kapt(versionCatalogLibs.room.compiler)
+    ksp(versionCatalogLibs.room.compiler)
     implementation(versionCatalogLibs.androidx.test.monitor)
     androidTestImplementation(versionCatalogLibs.bundles.test)
     androidTestImplementation(versionCatalogLibs.coroutine.test)
diff --git a/core/database/src/main/java/ytemplate/android/core/database/room/AppDataBase.kt b/core/database/src/main/java/ytemplate/android/core/database/room/AppDataBase.kt
@@ -11,7 +11,7 @@ import ytemplate.android.core.database.model.PostEntity
  *
  * @constructor Create empty App data base
  */
-@Database(entities = [PostEntity::class], version = DATABASE_VERSION)
+@Database(entities = [PostEntity::class], version = DATABASE_VERSION, exportSchema = false)
 abstract class AppDataBase : RoomDatabase() {
     /**
      * My model dao
diff --git a/core/test/src/main/java/ytemplate/android/core/test/FakePostRepository.kt b/core/test/src/main/java/ytemplate/android/core/test/FakePostRepository.kt
@@ -20,8 +20,8 @@ class FakePostRepository(val fakePostDao: FakePostDao = FakePostDao(), val fakeP
     private val _feed = MutableSharedFlow<List<Post>>()
     override val feed: SharedFlow<List<Post>> = _feed.asSharedFlow()
 
-    override suspend fun add(post: Post) {
-        fakePostDao.insert(post.map())
+    override suspend fun add(postItem: Post) {
+        fakePostDao.insert(postItem.map())
         emitData()
     }
 
@@ -40,7 +40,7 @@ class FakePostRepository(val fakePostDao: FakePostDao = FakePostDao(), val fakeP
                 AppResult.Success(remoteData.toPostList())
             } else {
                 emitData()
-                AppResult.Error((remoteData as AppResult.Error).exception)
+                AppResult.Error()
             }
         } catch (ex: Exception) {
             emitData()
diff --git a/feature/post/src/main/java/ytemplate/android/feature/post/ui/PostListScreen.kt b/feature/post/src/main/java/ytemplate/android/feature/post/ui/PostListScreen.kt
@@ -74,7 +74,11 @@ fun PostListScreen(viewModel: MyPostViewModel = hiltViewModel()) {
                 AppLoadingIndicator()
             }
             is MyPostModelUiState.Error -> {
-                StickyErrorMessageCard((dataState as MyPostModelUiState.Error).throwable.localizedMessage)
+                (dataState as MyPostModelUiState.Error).throwable.localizedMessage?.let {
+                    StickyErrorMessageCard(
+                        it
+                    )
+                }
             }
         }
     }
@@ -144,7 +148,7 @@ fun PreviewPostListScreen() {
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(dimensions.paddingLarge)
-            ) { newPost ->
+            ) { _ ->
             }
             SimplePostList(
                 listOf(
diff --git a/feature/post/src/test/java/ytemplate/android/feature/post/MyPostViewModelTest.kt b/feature/post/src/test/java/ytemplate/android/feature/post/MyPostViewModelTest.kt
@@ -23,16 +23,13 @@ import kotlin.time.Duration.Companion.milliseconds
  */
 @OptIn(ExperimentalCoroutinesApi::class)
 class MyPostViewModelTest {
-    private lateinit var repository: FakePostRepository
-
     /**
      * Set up
      *
      */
     @Before
     fun setUp() {
         Dispatchers.setMain(UnconfinedTestDispatcher())
-        repository = FakePostRepository()
     }
 
     /**
@@ -41,6 +38,7 @@ class MyPostViewModelTest {
      */
     @Test
     fun `test initial data is empty state`() = runTest {
+        var repository = FakePostRepository()
         val viewModel = MyPostViewModel(repository)
         viewModel.uiState.test {
             val firstDataState = awaitItem()
@@ -56,6 +54,7 @@ class MyPostViewModelTest {
      */
     @Test
     fun `test get data success state`() = runTest {
+        var repository = FakePostRepository()
         repository.fakePostApi.remotePostDataMock.setExpectSuccess()
         repository.fakePostApi.remotePostDataMock.setExpectedResponse(PlaceHolderData.DUMMY_DATA_GET_ALL_POST)
         val viewModel = MyPostViewModel(repository)
@@ -76,6 +75,7 @@ class MyPostViewModelTest {
      */
     @Test
     fun `test delete single data state`() = runTest {
+        var repository = FakePostRepository()
         repository.fakePostApi.remotePostDataMock.setExpectSuccess()
         repository.fakePostApi.remotePostDataMock.setExpectedResponse(PlaceHolderData.DUMMY_DATA_GET_ALL_POST)
         val viewModel = MyPostViewModel(repository)
@@ -100,6 +100,7 @@ class MyPostViewModelTest {
      */
     @Test
     fun `test add single data state`() = runTest {
+        var repository = FakePostRepository()
         repository.fakePostApi.remotePostDataMock.setExpectSuccess()
         repository.fakePostApi.remotePostDataMock.setExpectedResponse(PlaceHolderData.DUMMY_DATA_GET_ALL_POST)
         val viewModel = MyPostViewModel(repository)
@@ -122,6 +123,7 @@ class MyPostViewModelTest {
      */
     @Test
     fun `test errorState`() = runTest {
+        var repository = FakePostRepository()
         repository.fakePostApi.remotePostDataMock.setExpectFailure()
         repository.fakePostApi.remotePostDataMock.setExpectedResponse(null)
         val viewModel = MyPostViewModel(repository)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,33 +4,33 @@
 kotlinVersion = "1.8.10"
 kotlinJvmTarget = "11"
 kotlinxCoroutines = "1.6.4"
-kotlinxSerializationJson = "1.4.1"
+kotlinxSerializationJson = "1.5.0"
 
 #gradle
-androidGradlePlugin = "7.4.1"
+androidGradlePlugin = "7.4.2"
 
 #androidx
-androidxComposeBom = "2022.12.00"
-androidxActivityCompose = "1.6.1"
-androidxAppCompat = "1.5.1"
+androidxComposeBom = "2023.03.00"
+androidxActivityCompose = "1.7.0"
+androidxAppCompat = "1.6.1"
 androidxComposeCompiler = "1.4.3"
 androidxCore = "1.9.0"
-androidxLifecycle = "2.5.1"
+androidxLifecycle = "2.6.1"
 androidxNavigation = "2.5.3"
-androidxEspresso = "3.5.0"
+androidxEspresso = "3.5.1"
 androidxTestRules = "1.5.0"
-androidxTestRunner = "1.5.1"
-androidxTestMonitor = "1.6.0"
+androidxTestRunner = "1.5.2"
+androidxTestMonitor = "1.6.1"
 androidxTestCore = "1.4.0"
-androidxTestExt = "1.1.4"
+androidxTestExt = "1.1.5"
 
 #hilt
-hilt = "2.44"
+hilt = "2.45"
 hilt_nav_compose = "1.0.0"
 hiltExt = "1.0.0"
 
 #jacoco
-jacoco = "0.8.7"
+jacoco = "0.8.8"
 
 #compose
 compose_ui = "1.3.3"
@@ -41,41 +41,41 @@ compose_ui_testing = "1.4.0-beta01"
 core_ktx = "1.9.0"
 
 #ksp
-ksp = "1.7.21-1.0.8"
+ksp = "1.8.10-1.0.9"
 
 #coroutine
 coroutine = "1.6.4"
 turbine = "0.12.1"
 
 #room
-room= "2.4.3"
+room= "2.5.1"
 
 #ktor
-ktor = "2.2.2"
+ktor = "2.2.4"
 
 #android test
 junit4 = "4.13.2"
 
-android_junit = "1.1.4"
+android_junit = "1.1.5"
 espresso = "3.5.0"
 junit = "4.13.2"
-jupiter_junit = "5.5.2"
+jupiter_junit = "5.9.2"
 
 #Firebase
-firebase_analytics = "21.2.0"
-firebase_bom = "29.0.0"
+firebase_analytics = "21.2.1"
+firebase_bom = "31.4.0"
 
 #Mock
 anotation = "1.3.0"
-mockk_android = "1.12.1"
-test_runner = "1.4.0"
+mockk_android = "1.13.4"
+test_runner = "1.5.2"
 
 #sonar
 sonar = "4.0.0.2929"
 #dokka
-dokka = "1.7.20"
+dokka = "1.8.10"
 #ktlint
-ktlint = "11.2.0"
+ktlint = "11.3.1"
 
 [libraries]
 # Project
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Dec 20 17:55:16 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/renovate.json b/renovate.json
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,4 @@ class FirebaseConventionPlugin : Plugin<Project> {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`-}`
	`22`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,4 @@ class HiltConventionPlugin : Plugin<Project> {`
`32`	`32`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`-`
`36`		`-}`
	`35`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class LibraryConventionPlugin : Plugin<Project> {`
`24`	`24`	`apply(libs.findPlugin("android.library").get().get().pluginId)`
`25`	`25`	`apply(libs.findPlugin("kotlin.android").get().get().pluginId)`
`26`	`26`	`apply(libs.findPlugin("kotlin.serialization").get().get().pluginId)`
`27`		`-`
	`27`	`+ apply(libs.findPlugin("ksp").get().get().pluginId)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`extensions.configure<LibraryExtension> {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import ytemplate.android.jacoco.jacoco`
`15`	`15`	`*`
`16`	`16`	`* @constructor Create empty Library jacoco convention plugin`
`17`	`17`	`*/`
	`18`	`+@Suppress("UNCHECKED_CAST")`
`18`	`19`	`class ProjectJacocoConventionPlugin : Plugin<Project> {`
`19`	`20`	`private val project_level_limits = mutableMapOf(`
`20`	`21`	`"instruction" to 0.0,`
`@@ -36,7 +37,6 @@ class ProjectJacocoConventionPlugin : Plugin<Project> {`
`36`	`37`
`37`	`38`	`override fun apply(target: Project) {`
`38`	`39`	`with(target) {`
`39`		`- val libs = extensions.getByType<VersionCatalogsExtension>().named("versionCatalogLibs")`
`40`	`40`	`with(pluginManager) {`
`41`	`41`	`apply("jacoco")`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ private fun Project.addTestCoverageTask(`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`}`
`211`		`-`
	`211`	`+@Suppress("UNCHECKED_CAST")`
`212`	`212`	`fun Project.jacocoTestReport(taskName: String) {`
`213`	`213`	`val reportDir = jacoco.reportsDirectory.asFile.get()`
`214`	`214`	`val report = file("$reportDir/$taskName/${taskName}.xml")`
`@@ -235,7 +235,7 @@ private fun Project.addTestCoverageTask(`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`}`
`238`		`-`
	`238`	`+@Suppress("UNCHECKED_CAST")`
`239`	`239`	`fun File.extractTestCoverage(): Map<String, Double> {`
`240`	`240`	`val xmlReader = XmlSlurper().apply {`
`241`	`241`	`setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false)`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`java {`
`9`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`10`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`9`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`10`	`+ targetCompatibility = JavaVersion.VERSION_11`
`11`	`11`	`}`
`12`	`12`	`val test by tasks.getting(Test::class) {`
`13`	`13`	`useJUnitPlatform { }`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ import ytemplate.android.jacoco.setModuleTestCoverageLimits`
`3`	`3`
`4`	`4`	`plugins {`
`5`	`5`	`id("ytemplate.android.library")`
`6`		`- id("ytemplate.android.library.jacoco")`
`7`	`6`	`id("ytemplate.android.hilt")`
	`7`	`+ id("ytemplate.android.library.jacoco")`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`private val excludedFiles = mutableSetOf(`