Merge pull request #86 from wordpress-mobile/fix-hilt-configuration

Fix Hilt configuration
wordpress-mobile · Feb 5, 2025 · a636629 · a636629
2 parents d6daa7a + 14d6361
commit a636629
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/mediapicker/build.gradle b/mediapicker/build.gradle
@@ -49,7 +49,6 @@ android {
         implementation "com.github.bumptech.glide:glide:$glideVersion"
 
         implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
-        implementation "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
         kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 
         implementation "com.github.chrisbanes:PhotoView:$chrisbanesPhotoviewVersion"

diff --git a/mediapicker/source-device/build.gradle b/mediapicker/source-device/build.gradle
@@ -34,8 +34,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
 
     implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
-    implementation "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
-    kapt "com.google.dagger:dagger-compiler:$gradle.ext.daggerVersion"
+    kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 }
 
 project.afterEvaluate {

diff --git a/mediapicker/source-gif/build.gradle b/mediapicker/source-gif/build.gradle
@@ -36,7 +36,6 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:$squareupRetrofitVersion"
 
     implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
-    implementation "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
     kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 
     implementation "org.wordpress:utils:$wordpressUtilsVersion"

diff --git a/mediapicker/source-wordpress/build.gradle b/mediapicker/source-wordpress/build.gradle
@@ -34,8 +34,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
 
     implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion"
-    implementation "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"
-    kapt "com.google.dagger:dagger-compiler:$gradle.ext.daggerVersion"
+    kapt "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion"
 
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
 

diff --git a/mediapicker/src/main/java/org/wordpress/android/mediapicker/widget/ActionableEmptyView.kt b/mediapicker/src/main/java/org/wordpress/android/mediapicker/widget/ActionableEmptyView.kt
@@ -10,7 +10,6 @@ import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatButton
-import org.openjdk.tools.javac.main.Option.InvalidValueException
 import org.wordpress.android.mediapicker.R
 import org.wordpress.android.util.DisplayUtils
 
@@ -94,7 +93,7 @@ internal class ActionableEmptyView : LinearLayout {
             if (!titleAttribute.isNullOrEmpty()) {
                 title.text = titleAttribute
             } else {
-                throw InvalidValueException(
+                throw IllegalArgumentException(
                     "$context: ActionableEmptyView must have a title (aevTitle)"
                 )
             }