Update AGP Dependency

canopas · Jun 7, 2024 · a525efc · a525efc
2 parents d303938 + ac74648
commit a525efc
Show file tree

Hide file tree

Showing 31 changed files with 511 additions and 422 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -24,7 +24,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
@@ -50,22 +50,22 @@ android {
 
 dependencies {
 
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.2")
-    implementation(platform("androidx.compose:compose-bom:2023.09.00"))
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.1")
+    implementation("androidx.activity:activity-compose:1.9.0")
+    implementation(platform("androidx.compose:compose-bom:2024.05.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.navigation:navigation-compose:2.7.6")
+    implementation("androidx.navigation:navigation-compose:2.7.7")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2023.09.00"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.05.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     implementation(project(":bottombar"))
     implementation(kotlin("reflect"))
-}
+}
diff --git a/app/src/androidTest/java/com/example/animatedbottombarcompose/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/animatedbottombarcompose/ExampleInstrumentedTest.kt
@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.animatedbottombarcompose", appContext.packageName)
     }
-}
+}
diff --git a/app/src/main/java/com/example/animatedbottombarcompose/MainActivity.kt b/app/src/main/java/com/example/animatedbottombarcompose/MainActivity.kt
@@ -29,13 +29,13 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         setContent {
             AnimatedBottomBarComposeTheme {
-
                 val navController = rememberNavController()
                 val navBackStackEntry by navController.currentBackStackEntryAsState()
                 val currentRoute = navBackStackEntry?.destination?.route
-                val navigationItems = MainNavigation::class.nestedClasses.map {
-                    it.objectInstance as MainNavigation
-                }
+                val navigationItems =
+                    MainNavigation::class.nestedClasses.map {
+                        it.objectInstance as MainNavigation
+                    }
                 var selectedItem by remember { mutableIntStateOf(0) }
 
                 Scaffold(
@@ -44,7 +44,7 @@ class MainActivity : ComponentActivity() {
                             selectedItem = selectedItem,
                             itemSize = navigationItems.take(3).size,
                             containerColor = Color.LightGray,
-                            indicatorStyle = IndicatorStyle.DOT
+                            indicatorStyle = IndicatorStyle.DOT,
                         ) {
                             navigationItems.take(3).forEachIndexed { index, navigationItem ->
                                 BottomBarItem(
@@ -66,15 +66,15 @@ class MainActivity : ComponentActivity() {
                                     },
                                     imageVector = navigationItem.icon,
                                     label = navigationItem.title,
-                                    containerColor = Color.Transparent
+                                    containerColor = Color.Transparent,
                                 )
                             }
                         }
-                    }
+                    },
                 ) {
                     NavHost(
                         navController = navController,
-                        startDestination = MainNavigation.ScreenA.route
+                        startDestination = MainNavigation.ScreenA.route,
                     ) {
                         composable(MainNavigation.ScreenA.route) {
                             Screen1(navigationItems)
@@ -90,4 +90,4 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ class ExampleInstrumentedTest { @@
             val appContext = InstrumentationRegistry.getInstrumentation().targetContext
             assertEquals("com.example.animatedbottombarcompose", appContext.packageName)
         }
-    }
+    }