chore: update dependencies (#209)

jkuester · Jan 7, 2024 · 7194013 · 7194013
1 parent 7a988bd
commit 7194013
Show file tree

Hide file tree

Showing 17 changed files with 196 additions and 205 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -3,17 +3,16 @@ import com.google.protobuf.gradle.*
 plugins {
     id("com.android.application")
     id("dagger.hilt.android.plugin")
-    id("com.google.protobuf") version "0.9.0"
+    id("com.google.devtools.ksp")
+    id("com.google.protobuf")
     kotlin("android")
-    kotlin("android.extensions")
-    kotlin("kapt")
 }
 
 android {
     compileSdk = 34
     defaultConfig {
         applicationId = "com.jkuester.unlauncher"
-        minSdkVersion(21)
+        minSdk = 21
         targetSdk = 34
         versionName = "2.1.0-beta.1"
         versionCode = 19
@@ -29,7 +28,9 @@ android {
 //            }
 //        }
     }
-
+    buildFeatures {
+        viewBinding = true
+    }
     buildTypes {
         named("release").configure {
             isMinifyEnabled = true
@@ -74,38 +75,36 @@ android {
 }
 
 dependencies {
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-
     // Kotlin Libraries
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.22")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22") // This needs to match ksp and kotlin-gradle-plugin
 
     // Support Libraries
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.recyclerview:recyclerview:1.3.0")
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.datastore:datastore:1.0.0")
     implementation("androidx.datastore:datastore-core:1.0.0")
-    implementation("com.google.protobuf:protobuf-javalite:3.23.3")
+    implementation("com.google.protobuf:protobuf-javalite:3.25.1")
 
     // Arch Components
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.fragment:fragment-ktx:1.5.7")
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.fragment:fragment-ktx:1.6.2")
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
-    implementation("androidx.room:room-runtime:2.5.1")
-    kapt("androidx.room:room-compiler:2.5.1")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
+    implementation("androidx.room:room-runtime:2.6.1")
+    ksp("androidx.room:room-compiler:2.6.1")
 
     //3rd party libs
     implementation("com.intuit.sdp:sdp-android:1.0.6")
     implementation("com.intuit.ssp:ssp-android:1.0.6")
-    implementation("com.google.dagger:hilt-android:2.44.2")
-    kapt("androidx.hilt:hilt-compiler:1.0.0")
-    kapt("com.google.dagger:hilt-android-compiler:2.44")
+    implementation("com.google.dagger:hilt-android:2.50")
+    ksp("androidx.hilt:hilt-compiler:1.1.0")
+    ksp("com.google.dagger:hilt-android-compiler:2.50")
 }
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:3.17.3"
+        artifact = "com.google.protobuf:protoc:3.25.1"
     }
     generateProtoTasks {
         all().forEach { task ->

diff --git a/app/src/main/java/com/sduduzog/slimlauncher/di/ActivityModule.kt b/app/src/main/java/com/sduduzog/slimlauncher/di/ActivityModule.kt
@@ -1,5 +1,6 @@
 package com.sduduzog.slimlauncher.di
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import androidx.core.app.ComponentActivity
 import androidx.lifecycle.LifecycleCoroutineScope
@@ -14,6 +15,7 @@ import dagger.hilt.android.scopes.ActivityScoped
 @Module
 @InstallIn(ActivityComponent::class)
 class ActivityModule {
+    @SuppressLint("RestrictedApi")
     @Provides
     fun provideLifecycleCoroutineScope(activity: Activity): LifecycleCoroutineScope =
         (activity as ComponentActivity).lifecycleScope

diff --git a/app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/RenameAppDialog.kt b/app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/RenameAppDialog.kt
@@ -2,23 +2,22 @@ package com.sduduzog.slimlauncher.ui.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.sduduzog.slimlauncher.R
-import com.sduduzog.slimlauncher.models.HomeApp
+import com.sduduzog.slimlauncher.databinding.RenameDialogEditTextBinding
 import com.sduduzog.slimlauncher.models.CustomiseAppsViewModel
-import kotlinx.android.synthetic.main.customise_apps_fragment.*
+import com.sduduzog.slimlauncher.models.HomeApp
 
 class RenameAppDialog : DialogFragment() {
 
     private lateinit var app: HomeApp
     private lateinit var model: CustomiseAppsViewModel
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val view = layoutInflater.inflate(R.layout.rename_dialog_edit_text, customise_apps_fragment, false)
+        val view = RenameDialogEditTextBinding.inflate(layoutInflater).root
         val editText: EditText = view.findViewById(R.id.rename_editText)
         val appName: String = app.appNickname ?: app.appName
         editText.text.append(appName)

diff --git a/app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/RenameAppDisplayNameDialog.kt b/app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/RenameAppDisplayNameDialog.kt
@@ -2,22 +2,21 @@ package com.sduduzog.slimlauncher.ui.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.widget.EditText
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.jkuester.unlauncher.datastore.UnlauncherApp
 import com.sduduzog.slimlauncher.R
+import com.sduduzog.slimlauncher.databinding.RenameDialogEditTextBinding
 import com.sduduzog.slimlauncher.datasource.apps.UnlauncherAppsRepository
-import kotlinx.android.synthetic.main.customise_apps_fragment.*
 
 class RenameAppDisplayNameDialog : DialogFragment() {
     private lateinit var app: UnlauncherApp
     private lateinit var unlauncherAppsRepo: UnlauncherAppsRepository
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val view = layoutInflater.inflate(R.layout.rename_dialog_edit_text, customise_apps_fragment, false)
+        val view = RenameDialogEditTextBinding.inflate(layoutInflater).root
         val editText: EditText = view.findViewById(R.id.rename_editText)
         val appName: String = app.displayName
         editText.text.append(appName)