From 227d8d175eb056625f65bff9a95b1876d95e0890 Mon Sep 17 00:00:00 2001
From: Josiah Campbell <9521010+jocmp@users.noreply.github.com>
Date: Tue, 5 Dec 2023 20:48:16 -0600
Subject: [PATCH] Update dependencies

Updates compose, kotlin and AGP deps
---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  1 +
 .idea/kotlinc.xml                             |  6 ++++++
 .idea/misc.xml                                |  3 +--
 demo/build.gradle.kts                         |  7 ++++---
 demo/src/main/AndroidManifest.xml             |  3 +--
 .../com/mxalbert/sharedelements/demo/Demo.kt  |  3 ++-
 gradle.properties                             |  3 +++
 gradle/libs.versions.toml                     | 19 +++++++++----------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 shared-elements/build.gradle.kts              |  2 +-
 shared-elements/src/main/AndroidManifest.xml  |  2 +-
 12 files changed, 31 insertions(+), 22 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b823cf4..710ade2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..e805548
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.9.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 54d5acd..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
index d809cd8..25cfd39 100644
--- a/demo/build.gradle.kts
+++ b/demo/build.gradle.kts
@@ -5,9 +5,10 @@ plugins {
 
 android {
     compileSdk = libs.versions.sdk.compile.get().toInt()
-    buildToolsVersion = libs.versions.buildTools.get()
 
-    buildFeatures.compose = true
+    buildFeatures {
+        compose = true
+    }
 
     defaultConfig {
         applicationId = "com.mxalbert.sharedelements.demo"
@@ -35,12 +36,12 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
+    namespace = "com.mxalbert.sharedelements.demo"
 }
 
 dependencies {
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 83e7607..11292a8 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mxalbert.sharedelements.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="false"
diff --git a/demo/src/main/java/com/mxalbert/sharedelements/demo/Demo.kt b/demo/src/main/java/com/mxalbert/sharedelements/demo/Demo.kt
index 4dc7e68..1a66623 100644
--- a/demo/src/main/java/com/mxalbert/sharedelements/demo/Demo.kt
+++ b/demo/src/main/java/com/mxalbert/sharedelements/demo/Demo.kt
@@ -139,7 +139,8 @@ fun UserListRoot() {
         val listState = rememberLazyListState()
         Crossfade(
             targetState = selectedUser,
-            animationSpec = tween(durationMillis = TransitionDurationMillis)
+            animationSpec = tween(durationMillis = TransitionDurationMillis),
+            label = ""
         ) { user ->
             when {
                 user < 0 -> UserListScreen(listState)
diff --git a/gradle.properties b/gradle.properties
index ceecc8b..0ec7a9b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,3 +38,6 @@ POM_SCM_DEV_CONNECTION=scm:git:git://github.com/mxalbert1996/compose-shared-elem
 POM_DEVELOPER_ID=mxalbert1996
 POM_DEVELOPER_NAME=Albert Chang
 POM_DEVELOPER_URL=https://github.com/mxalbert1996/
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9877ad1..05849d7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,16 @@
 [versions]
-agp = "7.3.1"
+agp = "8.1.4"
 sdk-min = "21"
-sdk-target = "33"
-sdk-compile = "33"
-buildTools = "33.0.0"
+sdk-target = "34"
+sdk-compile = "34"
 maven-publish = "0.21.0"
-kotlin = "1.7.20"
-compose-compiler = "1.3.2"
-compose-bom = "2022.11.00"
-androidx-core = "1.9.0"
-androidx-activity = "1.6.1"
+kotlin = "1.9.20"
+compose-compiler = "1.5.4"
+compose-bom = "2023.10.01"
+androidx-core = "1.12.0"
+androidx-activity = "1.8.1"
 jUnit = "4.13.2"
-testExt = "1.1.4"
+testExt = "1.1.5"
 
 [libraries]
 kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 654beb5..59d807c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 04 17:51:34 JST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/shared-elements/build.gradle.kts b/shared-elements/build.gradle.kts
index 8d3ab9f..cd7f67f 100644
--- a/shared-elements/build.gradle.kts
+++ b/shared-elements/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
 
 android {
     compileSdk = libs.versions.sdk.compile.get().toInt()
-    buildToolsVersion = libs.versions.buildTools.get()
 
     buildFeatures {
         buildConfig = false
@@ -36,6 +35,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
+    namespace = "com.mxalbert.sharedelements"
 }
 
 dependencies {
diff --git a/shared-elements/src/main/AndroidManifest.xml b/shared-elements/src/main/AndroidManifest.xml
index a175a0c..8072ee0 100644
--- a/shared-elements/src/main/AndroidManifest.xml
+++ b/shared-elements/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.mxalbert.sharedelements" />
+<manifest />