Update kotlin, agp, compose (#8)

Co-authored-by: kiri <[email protected]>
get-bridge · May 23, 2024 · 5f5fc4d · 5f5fc4d
1 parent 74ace06
commit 5f5fc4d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 26 deletions.
diff --git a/buildSrc/src/main/kotlin/com/ouroboros/dependencies.kt b/buildSrc/src/main/kotlin/com/ouroboros/dependencies.kt
@@ -1,14 +1,14 @@
 package com.ouroboros
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:8.1.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:8.4.1"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.4.0"
 
     object Kotlin {
-        private const val version = "1.9.10"
+        private const val version = "1.9.22"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
     }
 
@@ -28,31 +28,34 @@ object Libs {
     }
 
     object Kotest {
-        private const val version = "5.6.0"
+        private const val version = "5.7.2"
         const val assertions = "io.kotest:kotest-assertions-core:$version"
     }
 
     object MockK {
-        private const val version = "1.13.3"
+        private const val version = "1.13.10"
         const val library = "io.mockk:mockk:$version"
     }
 
     object AndroidX {
-        const val appcompat = "androidx.appcompat:appcompat:1.5.0"
+        const val appcompat = "androidx.appcompat:appcompat:1.6.1"
 
-        const val activityCompose = "androidx.activity:activity-compose:1.6.1"
+        const val activityCompose = "androidx.activity:activity-compose:1.8.2"
         const val navigationCompose = "androidx.navigation:navigation-compose:2.5.3"
 
         object Compose {
+            const val bomVersion = "2024.05.00"
             const val version = "1.5.1"
-            const val compiler = "1.5.3"
+            const val compiler = "1.5.9"
 
-            const val runtime = "androidx.compose.runtime:runtime:$version"
-            const val foundation = "androidx.compose.foundation:foundation:${version}"
-            const val ui = "androidx.compose.ui:ui:${version}"
-            const val uiTooling = "androidx.compose.ui:ui-tooling:${version}"
-            const val material = "androidx.compose.material:material:${version}"
-            const val materialIconsExtended = "androidx.compose.material:material-icons-extended:${version}"
+            const val bom = "androidx.compose:compose-bom:$bomVersion"
+            const val runtime = "androidx.compose.runtime:runtime"
+            const val foundation = "androidx.compose.foundation:foundation"
+            const val ui = "androidx.compose.ui:ui"
+            const val uiTooling = "androidx.compose.ui:ui-tooling"
+            const val material = "androidx.compose.material:material"
+            const val materialIconsExtended =
+                "androidx.compose.material:material-icons-extended"
         }
 
         object Test {
@@ -61,13 +64,13 @@ object Libs {
             const val rules = "androidx.test:rules:$version"
 
             object Ext {
-                private const val version = "1.1.2"
+                private const val version = "1.1.5"
                 const val junit = "androidx.test.ext:junit-ktx:$version"
             }
         }
 
         object Lifecycle {
-            private const val version = "2.6.1"
+            private const val version = "2.7.0"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
             const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
             const val viewmodelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"

diff --git a/core/build.gradle b/core/build.gradle
@@ -57,6 +57,7 @@ dependencies {
     api Libs.Coroutines.core
     api Libs.Coroutines.android
 
+    implementation platform(Libs.AndroidX.Compose.bom)
     implementation Libs.AndroidX.Compose.runtime
     implementation Libs.AndroidX.Compose.ui
     implementation Libs.AndroidX.Lifecycle.viewmodel

diff --git a/example-app/build.gradle b/example-app/build.gradle
@@ -69,6 +69,7 @@ android {
 dependencies {
     implementation project(':core')
 
+    implementation platform(Libs.AndroidX.Compose.bom)
     implementation Libs.AndroidX.Compose.foundation
     implementation Libs.AndroidX.Compose.material
     implementation Libs.AndroidX.Compose.materialIconsExtended

diff --git a/example-app/src/main/AndroidManifest.xml b/example-app/src/main/AndroidManifest.xml
@@ -3,8 +3,7 @@
   ~ Copyright (C) 2019 - present Instructure, Inc.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bridge.ouroboros.exampleapplication">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/example-app/src/main/kotlin/com/bridge/ouroboros/exampleapplication/examples.kt b/example-app/src/main/kotlin/com/bridge/ouroboros/exampleapplication/examples.kt
@@ -2,8 +2,8 @@ package com.bridge.ouroboros.exampleapplication
 
 import androidx.annotation.StringRes
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Login
-import androidx.compose.material.icons.filled.Note
+import androidx.compose.material.icons.automirrored.filled.Login
+import androidx.compose.material.icons.automirrored.filled.Note
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 import com.bridge.ouroboros.exampleapplication.examples.dictionary.DictionaryExample
@@ -18,13 +18,13 @@ data class Example(
 val knownExamples = listOf(
     Example(
         route = "login",
-        icon = Icons.Default.Login,
+        icon = Icons.AutoMirrored.Filled.Login,
         title = R.string.login,
         composable = { LoginExample() }
     ),
     Example(
         route = "dictionary",
-        icon = Icons.Default.Note,
+        icon = Icons.AutoMirrored.Filled.Note,
         title = R.string.dictionary,
         composable = { DictionaryExample() }
     )

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Thu Jul 13 10:33:09 CEST 2023
+#Thu May 16 14:29:48 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test/build.gradle b/test/build.gradle
@@ -10,11 +10,11 @@ apply plugin: 'kotlin-android'
 android {
     namespace = "com.bridge.ouroboros.compose.test"
 
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdk 21
+        targetSdk 34
     }
 
     buildTypes {