From 6004addf629239c95a03763b8122f7d855104999 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 5 Aug 2021 02:11:31 +0530
Subject: Upgrade Compose and other AndroidX libraries (#1477)

* app: re-enable Compose

* app: remove inapplicable lint suppression

* gradle: bump AndroidX dependencies
---
 app/build.gradle.kts      | 27 ++++++++++-----------------
 gradle/libs.versions.toml |  8 ++++----
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index adb2fcbc..4ae3136e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,7 +14,6 @@ plugins {
   `crowdin-plugin`
 }
 
-/*
 repositories {
   val composeSnapshot = libs.versions.composeSnapshot.get()
   if (composeSnapshot.length > 1) {
@@ -30,7 +29,6 @@ repositories {
     }
   }
 }
-*/
 
 configure<CrowdinExtension> { projectName = "android-password-store" }
 
@@ -49,21 +47,16 @@ android {
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 
-  // buildFeatures.compose = true
+  buildFeatures.compose = true
 
   lintOptions {
     isAbortOnError = true
     isCheckReleaseBuilds = false
     disable("MissingTranslation", "PluralsCandidate", "ImpliedQuantity")
-    // https://issuetracker.google.com/issues/187524311
-    disable("DialogFragmentCallbacksDetector")
     disable("CoroutineCreationDuringComposition")
   }
 
-  //  composeOptions {
-  //    kotlinCompilerVersion = libs.versions.kotlin.get()
-  //    kotlinCompilerExtensionVersion = libs.versions.compose.get()
-  //  }
+  composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.get() }
 }
 
 dependencies {
@@ -94,14 +87,14 @@ dependencies {
   implementation(libs.kotlin.coroutines.android)
   implementation(libs.kotlin.coroutines.core)
 
-  // implementation(libs.androidx.activity.compose)
-  // implementation(libs.androidx.hilt.compose)
-  // implementation(libs.compose.foundation.core)
-  // implementation(libs.compose.foundation.layout)
-  // implementation(libs.compose.material)
-  // implementation(libs.compose.ui.core)
-  // implementation(libs.compose.ui.viewbinding)
-  // compileOnly(libs.compose.ui.tooling)
+  implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.hilt.compose)
+  implementation(libs.compose.foundation.core)
+  implementation(libs.compose.foundation.layout)
+  implementation(libs.compose.material)
+  implementation(libs.compose.ui.core)
+  implementation(libs.compose.ui.viewbinding)
+  compileOnly(libs.compose.ui.tooling)
 
   implementation(libs.aps.sublimeFuzzy)
   implementation(libs.aps.zxingAndroidEmbedded)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fafa15aa..223ea9a2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 # Centralized versions for dependencies that share versions
 [versions]
-androidx_activity = "1.3.0-rc02"
+androidx_activity = "1.3.1"
 androidx_test = "1.4.0"
-compose = "1.0.0-rc02"
+compose = "1.1.0-alpha01"
 composeSnapshot = "-"
 coroutines = "1.5.1"
 hilt = "2.38.1"
 kotlin = "1.5.21"
-lifecycle = "2.4.0-alpha02"
+lifecycle = "2.4.0-alpha03"
 
 [libraries]
 # Kotlin dependencies
@@ -24,7 +24,7 @@ androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.0-rc01"
 androidx-core-ktx = "androidx.core:core-ktx:1.7.0-alpha01"
 androidx-documentfile = "androidx.documentfile:documentfile:1.0.1"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha05"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-alpha06"
 androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref="lifecycle" }
 androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" }
-- 
cgit v1.2.3