From 6a4c6dc028e4c147ffa1a3bd127b40c59cf499d9 Mon Sep 17 00:00:00 2001
From: Grigorii Bykov <g.m.bykov@tinkoff.ru>
Date: Mon, 10 Apr 2023 20:43:59 +0400
Subject: [PATCH] Fix classpath to run the App

- Comment out AppStartup. Refer to https://github.com/tinkoff-mobile-tech/forma/commit/44200e44c923346873aa5169f81c761b06cc6ac0
- Update some library versions to add missing classes in classpath
- Add collections-ktx library as a dependency to navigation-ktx cause missing SparseArrayKt file in classpath
---
 application/buildSrc/src/main/java/Androidx.kt         |  6 +++++-
 application/buildSrc/src/main/java/Versions.kt         | 10 +++++-----
 .../com/stepango/blockme/root/library/SampleApp.kt     |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/application/buildSrc/src/main/java/Androidx.kt b/application/buildSrc/src/main/java/Androidx.kt
index 85451c13..652ed1fe 100644
--- a/application/buildSrc/src/main/java/Androidx.kt
+++ b/application/buildSrc/src/main/java/Androidx.kt
@@ -10,6 +10,10 @@ object androidx {
         annotation,
         "androidx.collection:collection:${versions.androidx.collection}".dep
     )
+    private val collection_ktx = deps(
+        collection,
+        "androidx.collection:collection-ktx:${versions.androidx.collection}".dep,
+    )
     private val versionedparcelable = deps(
         "androidx.versionedparcelable:versionedparcelable:${versions.androidx.versionedparcelable}".dep,
         annotation,
@@ -262,7 +266,7 @@ object androidx {
     private val navigation_common_ktx = deps(
         "androidx.navigation:navigation-common-ktx:${versions.androidx.navigation}".dep,
         annotation,
-        collection,
+        collection_ktx,
         core
     )
 
diff --git a/application/buildSrc/src/main/java/Versions.kt b/application/buildSrc/src/main/java/Versions.kt
index 81727031..278b0ae0 100644
--- a/application/buildSrc/src/main/java/Versions.kt
+++ b/application/buildSrc/src/main/java/Versions.kt
@@ -7,13 +7,13 @@ object versions {
     }
 
     object androidx {
-        const val activity = "1.1.0"
+        const val activity = "1.2.4"
         const val annotation = "1.1.0"
         const val arch = "2.1.0"
         const val asynclayoutinflater = "1.0.0"
         const val appcompat = "1.2.0"
         const val cardview = "1.0.0"
-        const val collection = "1.0.0"
+        const val collection = "1.2.0"
         const val core = "1.3.1"
         const val core_common = "2.1.0"
         const val coordinatorlayout = "1.1.0"
@@ -23,16 +23,16 @@ object versions {
         const val documentfile = "1.0.1"
         const val drawerlayout = "1.1.0"
         const val interpolator = "1.0.0"
-        const val fragment = "1.2.5"
+        const val fragment = "1.4.1"
         const val legacy = "1.0.0"
         const val lifecycle = "2.5.1"
         const val loader = "1.1.0"
         const val localbroadcastmanager = "1.0.0"
         const val navigation = "2.4.2"
-        const val savedstate = "1.0.0"
+        const val savedstate = "1.1.0"
         const val slidingpanelayout = "1.0.0"
         const val swiperefreshlayout = "1.0.0"
-        const val sqlite = "2.0.1"
+        const val sqlite = "2.2.0"
         const val paging = "2.1.2"
         const val recyclerview = "1.1.0"
         const val room = "2.4.0"
diff --git a/application/root-app/src/main/java/com/stepango/blockme/root/library/SampleApp.kt b/application/root-app/src/main/java/com/stepango/blockme/root/library/SampleApp.kt
index b59a9009..119c4538 100644
--- a/application/root-app/src/main/java/com/stepango/blockme/root/library/SampleApp.kt
+++ b/application/root-app/src/main/java/com/stepango/blockme/root/library/SampleApp.kt
@@ -68,7 +68,7 @@ class SampleApp : SplitCompatApplication(),
 
     override fun onCreate() {
         super.onCreate()
-        AppStartup.init(this)
+//        AppStartup.init(this)
         initTimber()
         initRootDependencyInjection()
         initRandomNightMode()