From 69f3b7667420b81d249f7bc6e7858b5ff7196160 Mon Sep 17 00:00:00 2001
From: Amy Gu <xiangamygu@gmail.com>
Date: Thu, 1 Dec 2022 10:57:09 -0800
Subject: [PATCH 1/5] [ADR Jam Week] Update app dependencies

---
 build.gradle | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6543db59d..c1cae474f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
-    ext.kotlinVersion = '1.7.0'
-    ext.navigationVersion = '2.5.0'
+    ext.kotlinVersion = '1.7.20'
+    ext.navigationVersion = '2.5.3'
     ext.ktlintVersion = '0.44.0'
-    ext.hiltVersion = '2.42'
+    ext.hiltVersion = '2.44.2'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
@@ -55,26 +55,26 @@ ext {
     compileSdkVersion = 32
 
     // App dependencies
-    accompanistVersion = '0.23.0'
-    activityComposeVersion = '1.4.0'
+    accompanistVersion = '0.25.1'
+    activityComposeVersion = '1.5.1'
     androidXVersion = '1.0.0'
-    androidXTestCoreVersion = '1.4.1-alpha06'
-    androidXTestExtKotlinRunnerVersion = '1.1.4-alpha06'
-    androidXTestRulesVersion = '1.4.1-alpha06'
-    androidXAnnotations = '1.3.0'
+    androidXTestCoreVersion = '1.5.0'
+    androidXTestExtKotlinRunnerVersion = '1.1.4'
+    androidXTestRulesVersion = '1.5.0'
+    androidXAnnotations = '1.5.0'
     archLifecycleVersion = '2.6.0-alpha01'
     archTestingVersion = '2.1.0'
     composeVersion = '1.2.0'
-    composeCompilerVersion = '1.2.0'
-    coroutinesVersion = '1.6.1'
+    composeCompilerVersion = '1.3.2'
+    coroutinesVersion = '1.6.4'
     dexMakerVersion = '2.12.1'
-    espressoVersion = '3.5.0-alpha06'
+    espressoVersion = '3.5.0'
     hamcrestVersion = '1.3'
     hiltAndroidXVersion = '1.0.0'
     junitVersion = '4.13.2'
     multiDexVersion = '2.0.1'
-    robolectricVersion = '4.8.1'
-    roomVersion = '2.4.2'
+    robolectricVersion = '4.9'
+    roomVersion = '2.4.3'
     rulesVersion = '1.0.1'
     timberVersion = '4.7.1'
     truthVersion = '1.1.2'

From f2bf4107a448d0f8bf713a6fc363e2bd9660dc6c Mon Sep 17 00:00:00 2001
From: Amy Gu <xiangamygu@gmail.com>
Date: Thu, 1 Dec 2022 11:02:17 -0800
Subject: [PATCH 2/5] [ADR Jam Week] Remove repo info from build.gradle

---
 build.gradle | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index c1cae474f..7eb608caf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,10 +4,6 @@ buildscript {
     ext.ktlintVersion = '0.44.0'
     ext.hiltVersion = '2.44.2'
 
-    repositories {
-        google()
-        mavenCentral()
-    }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
@@ -24,10 +20,6 @@ plugins {
 }
 
 allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
     apply plugin: 'com.diffplug.spotless'
     spotless {
         kotlin {

From cf1def9e9515db88c663e6da34b1f8e659eb6f2b Mon Sep 17 00:00:00 2001
From: Amy Gu <xiangamygu@gmail.com>
Date: Thu, 1 Dec 2022 11:16:37 -0800
Subject: [PATCH 3/5] [ADR Jam Week] Add repo info to `settings.gradle`

---
 settings.gradle | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index e7b4def49..1e7b2cc14 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,15 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
 include ':app'

From 3f067e5e55aa36aaa833576009dd77bdae352247 Mon Sep 17 00:00:00 2001
From: Amy Gu <xiangamygu@gmail.com>
Date: Thu, 1 Dec 2022 11:17:49 -0800
Subject: [PATCH 4/5] [ADR Jam Week] Turn off Jetifier check

Jetifier check is no longer needed since all the libraries used support AndroidX natively.
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 70c712076..21245a3f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryErr
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
+android.enableJetifier=false
 android.useAndroidX=true
 kapt.incremental.apt=true

From efcbab4ad11a3c1e0e060c3a5baaf92420fc0fc5 Mon Sep 17 00:00:00 2001
From: Amy Gu <xiangamygu@gmail.com>
Date: Thu, 1 Dec 2022 11:18:49 -0800
Subject: [PATCH 5/5] [ADR Jam Week] Enable configuration cache

Suggestion from Build Analyzer to optimize build.
---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index 21245a3f6..b25d1752d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,4 @@ org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryErr
 android.enableJetifier=false
 android.useAndroidX=true
 kapt.incremental.apt=true
+org.gradle.unsafe.configuration-cache=true