From ff766fe9ccf633e531b23c6f16f1874ed81ca87f Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 14 Dec 2023 21:29:45 -0800
Subject: [PATCH] Version updates

---
 .gitignore                               |  1 +
 .idea/migrations.xml                     | 10 ++++++++++
 app-compose/build.gradle                 | 24 ++++++++++++------------
 app-compose/src/main/AndroidManifest.xml |  1 -
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 .idea/migrations.xml

diff --git a/.gitignore b/.gitignore
index a8fce5466..113208800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,5 +31,6 @@
 .idea/**/libraries
 .idea/**/assetWizardSettings.xml
 .idea/**/caches
+.idea/deploymentTargetDropDown.xml
 .idea/modules.xml
 .idea/modules
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 000000000..f8051a6f9
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app-compose/build.gradle b/app-compose/build.gradle
index 00e9df078..16c5f636e 100644
--- a/app-compose/build.gradle
+++ b/app-compose/build.gradle
@@ -11,12 +11,12 @@ plugins {
 apply from: '../spotless.gradle'
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.pitchedapps.frost"
         minSdk 26
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
         multiDexEnabled = true
@@ -40,7 +40,7 @@ android {
 
     composeOptions {
         // https://developer.android.com/jetpack/androidx/releases/compose-compiler
-        kotlinCompilerExtensionVersion = "1.4.7"
+        kotlinCompilerExtensionVersion = "1.5.6"
     }
 
     buildTypes {
@@ -140,10 +140,10 @@ project.configurations.configureEach {
 
 dependencies {
 
-    implementation "androidx.core:core-ktx:1.10.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
+    implementation "androidx.core:core-ktx:1.12.0"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "com.google.android.material:material:1.9.0"
+    implementation "com.google.android.material:material:1.11.0"
 
 //    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
 //    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
@@ -152,7 +152,7 @@ dependencies {
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "com.google.truth:truth:1.1.3"
-    testImplementation "org.json:json:20220320"
+    testImplementation "org.json:json:20230227"
     androidTestImplementation "androidx.test.ext:junit:1.1.5"
     androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
 
@@ -178,7 +178,7 @@ dependencies {
     // https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-gecko/maven-metadata.xml
     // https://github.com/mozilla-mobile/reference-browser/blob/master/buildSrc/src/main/java/AndroidComponents.kt
     // https://nightly.maven.mozilla.org/maven2/org/mozilla/components/browser-engine-gecko/maven-metadata.xml
-    def mozillaAndroidComponents = "116.0.20230617040331"
+    def mozillaAndroidComponents = "122.0.20231214160125"
 
     implementation "org.mozilla.components:lib-state:${mozillaAndroidComponents}"
     // Kept for reference; not needed
@@ -188,16 +188,16 @@ dependencies {
     def composeVersion = "1.4.3"
 
     implementation("androidx.compose.ui:ui:${composeVersion}")
-    implementation("androidx.activity:activity-compose:1.7.2")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
-    implementation("androidx.navigation:navigation-compose:2.6.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")
+    implementation("androidx.navigation:navigation-compose:2.7.6")
     // Tooling support (Previews, etc.)
     implementation("androidx.compose.ui:ui-tooling:${composeVersion}")
     // Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
     implementation("androidx.compose.foundation:foundation:${composeVersion}")
     // Material Design
     implementation("androidx.compose.material:material:${composeVersion}")
-    implementation 'androidx.compose.material3:material3:1.2.0-alpha02'
+    implementation 'androidx.compose.material3:material3:1.2.0-beta01'
     // Material design icons
     implementation("androidx.compose.material:material-icons-core:${composeVersion}")
     implementation("androidx.compose.material:material-icons-extended:${composeVersion}")
diff --git a/app-compose/src/main/AndroidManifest.xml b/app-compose/src/main/AndroidManifest.xml
index e51144ee0..d6a292dcc 100644
--- a/app-compose/src/main/AndroidManifest.xml
+++ b/app-compose/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
     <application
         android:name=".FrostApp"
         android:allowBackup="true"
-        android:extractNativeLibs="false"
         android:fullBackupContent="@xml/frost_backup_rules"
         android:icon="@mipmap/ic_launcher_round"
         android:label="@string/frost_name"
diff --git a/build.gradle b/build.gradle
index d7e690e25..d3efeadac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
 plugins {
     // https://mvnrepository.com/artifact/com.android.application/com.android.application.gradle.plugin?repo=google
-    id 'com.android.application' version '8.1.0-beta04' apply false
+    id 'com.android.application' version '8.2.0' apply false
     id 'com.android.library' version '8.0.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
     // https://mvnrepository.com/artifact/com.google.devtools.ksp/com.google.devtools.ksp.gradle.plugin
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ff9ef3c44..a4ea4b50e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME