⬆️ bump versions

boitakub · Jul 14, 2024 · a88b811 · a88b811
1 parent 99c7068
commit a88b811
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 84 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -80,7 +80,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.2"
+        kotlinCompilerExtensionVersion = "1.5.14"
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -110,14 +110,11 @@ android {
 dependencies {
     val androidCoreVersion: String by project
     val lifecycleVersion: String by project
-    val appcompatVersion: String by project
-    val activityVersion: String by project
+    val composeBomVersion: String by project
     val coilVersion: String by project
     val navigationVersion: String by project
     val daggerVersion: String by project
     val hiltVersion: String by project
-    val composeVersion: String by project
-    val materialVersion: String by project
     val okhttpVersion: String by project
     val retrofitVersion: String by project
     val dataStoreVersion: String by project
@@ -139,7 +136,6 @@ dependencies {
     //region Core & Lifecycle
 
     implementation("androidx.core:core-ktx:$androidCoreVersion")
-    implementation("androidx.appcompat:appcompat:$appcompatVersion")
     implementation("androidx.lifecycle:lifecycle-runtime-compose:$lifecycleVersion")
 
     //endregion
@@ -155,15 +151,16 @@ dependencies {
 
     //region UI
 
-    implementation("androidx.compose.material3:material3:$materialVersion")
-    implementation("androidx.activity:activity-compose:$activityVersion")
     implementation("androidx.navigation:navigation-compose:$navigationVersion")
     implementation("io.coil-kt:coil-compose:$coilVersion")
 
     // UI - Tooling
-    implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
+    val composeBom = platform("androidx.compose:compose-bom:$composeBomVersion")
+    implementation(composeBom)
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
 
     //endregion
 
@@ -222,7 +219,6 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
     androidTestImplementation("io.mockk:mockk-android:$mockkVersion")
     androidTestImplementation("io.mockk:mockk-agent:$mockkVersion")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
     androidTestImplementation("com.google.dagger:hilt-android-testing:$daggerVersion")
     kaptAndroidTest("com.google.dagger:hilt-compiler:$daggerVersion")
     androidTestImplementation("androidx.work:work-testing:$workVersion")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,15 +16,15 @@ buildscript {
     }
     dependencies {
         // -- Core plugins
-        classpath("com.android.tools.build:gradle:8.1.2")
+        classpath("com.android.tools.build:gradle:8.5.1")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
 
         // -- Application plugins
         classpath("com.google.dagger:hilt-android-gradle-plugin:$daggerVersion")
 
         // -- Services & Monitoring
-        classpath("com.google.gms:google-services:4.3.14")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
+        classpath("com.google.gms:google-services:4.4.2")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.2")
         classpath("com.google.firebase:perf-plugin:1.4.2")
     }
 }

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -6,11 +6,12 @@ plugins {
 }
 
 android {
+    val composeCompilerVersion: String by project
     compileSdk = 33
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 31
+        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -33,7 +34,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.2"
+        kotlinCompilerExtensionVersion = composeCompilerVersion
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -49,8 +50,7 @@ dependencies {
     val lifecycleVersion: String by project
     val daggerVersion: String by project
     val hiltVersion: String by project
-    val materialVersion: String by project
-    val composeVersion: String by project
+    val composeBomVersion: String by project
     val junitVersion: String by project
     val espressoVersion: String by project
 
@@ -59,17 +59,14 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
 
-    //region UI
-    implementation("androidx.compose.material3:material3:$materialVersion")
-
-    //region Compose
-
-    implementation("androidx.compose.foundation:foundation:$composeVersion")
-    implementation("androidx.compose.ui:ui:$composeVersion")
-
-    // Android Studio Preview support
-    implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    //region UI / Compose
+    val composeBom = platform("androidx.compose:compose-bom:$composeBomVersion")
+    implementation(composeBom)
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.foundation:foundation")
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
 
     //endregion
 

diff --git a/feature/boardgame/build.gradle.kts b/feature/boardgame/build.gradle.kts
@@ -6,11 +6,13 @@ plugins {
 }
 
 android {
+    val composeCompilerVersion: String by project
+
     compileSdk = 33
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 31
+        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -36,7 +38,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.2"
+        kotlinCompilerExtensionVersion = composeCompilerVersion
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -53,14 +55,12 @@ android {
 
 dependencies {
     val androidCoreVersion: String by project
-    val appcompatVersion: String by project
     val okioVersion: String by project
     val navigationVersion: String by project
     val lifecycleVersion: String by project
     val daggerVersion: String by project
     val hiltVersion: String by project
-    val materialVersion: String by project
-    val composeVersion: String by project
+    val composeBomVersion: String by project
     val coilVersion: String by project
     val roomVersion: String by project
     val workVersion: String by project
@@ -76,7 +76,6 @@ dependencies {
     //region Core & Lifecycle
 
     implementation("androidx.core:core-ktx:$androidCoreVersion")
-    implementation("androidx.appcompat:appcompat:$appcompatVersion")
     implementation("com.squareup.okio:okio:$okioVersion")
 
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
@@ -95,16 +94,18 @@ dependencies {
 
     //region UI
 
-    implementation("androidx.compose.foundation:foundation:$composeVersion")
-    implementation("androidx.compose.ui:ui:$composeVersion")
-    implementation("androidx.compose.material3:material3:$materialVersion")
+    val composeBom = platform("androidx.compose:compose-bom:$composeBomVersion")
+    implementation(composeBom)
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.foundation:foundation")
+    implementation("androidx.compose.ui:ui")
     implementation("androidx.navigation:navigation-compose:$navigationVersion")
     implementation("androidx.hilt:hilt-navigation-compose:$hiltVersion")
     implementation("io.coil-kt:coil-compose:$coilVersion")
 
     // UI - Tooling
-    implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
 
     //endregion
 
@@ -139,9 +140,6 @@ dependencies {
     androidTestImplementation("io.mockk:mockk-android:$mockkVersion")
     androidTestImplementation("io.mockk:mockk-agent:$mockkVersion")
 
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
-
     androidTestImplementation("androidx.work:work-testing:$workVersion")
 
     //endregion

diff --git a/feature/boardgame/src/main/java/fr/boitakub/bogadex/boardgame/BoardGameDao.kt b/feature/boardgame/src/main/java/fr/boitakub/bogadex/boardgame/BoardGameDao.kt
@@ -47,6 +47,6 @@ interface BoardGameDao {
     @Query("SELECT * FROM boardgame")
     fun getBoardGameWithStatistics(): Flow<List<BoardGame>>
 
-    @Query("SELECT * FROM boardgame WHERE bgg_id LIKE :bggId")
+    @Query("SELECT * FROM boardgame WHERE bgg_id = :bggId")
     fun getBoardGameWithId(bggId: String): Flow<BoardGame>
 }
diff --git a/feature/boardgame_list/build.gradle.kts b/feature/boardgame_list/build.gradle.kts
@@ -6,11 +6,12 @@ plugins {
 }
 
 android {
+    val composeCompilerVersion: String by project
     compileSdk = 33
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 31
+        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -33,7 +34,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.2"
+        kotlinCompilerExtensionVersion = composeCompilerVersion
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -47,14 +48,12 @@ android {
 
 dependencies {
     val androidCoreVersion: String by project
-    val appcompatVersion: String by project
     val okioVersion: String by project
     val navigationVersion: String by project
     val lifecycleVersion: String by project
     val daggerVersion: String by project
     val hiltVersion: String by project
-    val materialVersion: String by project
-    val composeVersion: String by project
+    val composeBomVersion: String by project
     val coilVersion: String by project
     val roomVersion: String by project
     val workVersion: String by project
@@ -71,7 +70,6 @@ dependencies {
     //region Core & Lifecycle
 
     implementation("androidx.core:core-ktx:$androidCoreVersion")
-    implementation("androidx.appcompat:appcompat:$appcompatVersion")
     implementation("com.squareup.okio:okio:$okioVersion")
 
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
@@ -91,16 +89,16 @@ dependencies {
 
     //region UI
 
-    implementation("androidx.compose.foundation:foundation:$composeVersion")
-    implementation("androidx.compose.ui:ui:$composeVersion")
-    implementation("androidx.compose.material3:material3:$materialVersion")
+    val composeBom = platform("androidx.compose:compose-bom:$composeBomVersion")
+    implementation(composeBom)
+    implementation("androidx.compose.material3:material3")
     implementation("androidx.navigation:navigation-compose:$navigationVersion")
     implementation("androidx.hilt:hilt-navigation-compose:$hiltVersion")
     implementation("io.coil-kt:coil-compose:$coilVersion")
 
     // UI - Tooling
-    implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
 
     //endregion
 
@@ -132,10 +130,6 @@ dependencies {
 
     androidTestImplementation("io.mockk:mockk-android:$mockkVersion")
     androidTestImplementation("io.mockk:mockk-agent:$mockkVersion")
-
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
-
     androidTestImplementation("androidx.work:work-testing:$workVersion")
 
     //endregion

diff --git a/feature/preferences/build.gradle.kts b/feature/preferences/build.gradle.kts
@@ -6,11 +6,12 @@ plugins {
 }
 
 android {
+    val composeCompilerVersion: String by project
     compileSdk = 33
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 31
+        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -33,7 +34,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.2"
+        kotlinCompilerExtensionVersion = composeCompilerVersion
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -50,8 +51,7 @@ dependencies {
     val lifecycleVersion: String by project
     val daggerVersion: String by project
     val hiltVersion: String by project
-    val composeVersion: String by project
-    val materialVersion: String by project
+    val composeBomVersion: String by project
     val navigationVersion: String by project
     val dataStoreVersion: String by project
     val junitVersion: String by project
@@ -77,13 +77,15 @@ dependencies {
 
     //region UI
 
-    implementation("androidx.compose.foundation:foundation:$composeVersion")
-    implementation("androidx.compose.ui:ui:$composeVersion")
-    implementation("androidx.compose.material3:material3:$materialVersion")
+    val composeBom = platform("androidx.compose:compose-bom:$composeBomVersion")
+    implementation(composeBom)
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.foundation:foundation")
+    implementation("androidx.compose.ui:ui")
 
     // UI - Tooling
-    implementation("androidx.compose.ui:ui-tooling-preview:$composeVersion")
-    debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
 
     //endregion
 

diff --git a/gradle.properties b/gradle.properties
@@ -37,30 +37,23 @@ android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
 android.defaults.buildfeatures.buildconfig=true
 
-# ----Android Studio---
-# Defaults sidebar view to project instead of android
-studio.projectview=true
-
 # ---Versions---
 
 # ----Dependencies---
-kotlinVersion=1.8.10
-appcompatVersion=1.6.1
+kotlinVersion=1.9.24
 androidCoreVersion=1.9.0
 dataStoreVersion=1.0.0
 okioVersion=3.3.0
-activityVersion=1.7.0-beta02
-fragmentVersion=1.5.5
 recyclerviewVersion=1.3.0
 navigationVersion=2.5.3
-materialVersion=1.1.0-beta01
 coilVersion=2.3.0
-composeVersion=1.4.0-rc01
+composeBomVersion=2024.06.00
+composeCompilerVersion=1.5.14
 daggerVersion=2.48.1
 hiltVersion=1.0.0
 okhttpVersion=4.10.0
 retrofitVersion=2.9.0
-roomVersion=2.5.0
+roomVersion=2.6.1
 workVersion=2.8.1
 firebaseVersion=31.2.3
 lifecycleVersion=2.6.0