Merge pull request #13458 from woocommerce/task/bump-media-picker-fix…

…-hilt Update Media Picker library to fix issues with Hilt integration
woocommerce · Feb 5, 2025 · c4dd29b · c4dd29b
2 parents 6575ddb + af08a74
commit c4dd29b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 59 deletions.
diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
@@ -339,7 +339,7 @@ dependencies {
         exclude group: "com.google.protobuf", module: "protobuf-lite"
     }
     androidTestImplementation(libs.google.dagger.hilt.android.testing)
-    kspAndroidTest(libs.google.dagger.hilt.android.compiler)
+    kspAndroidTest(libs.google.dagger.hilt.compiler)
     androidTestImplementation(libs.androidx.test.uiautomator)
 
     // Dependencies for screenshots

diff --git a/WooCommerce/proguard-rules.pro b/WooCommerce/proguard-rules.pro
@@ -85,63 +85,8 @@
 }
 ###### SavedStateHandleExt - end
 
-# This is generated automatically by the Android Gradle plugin. (8.1.0)
--dontwarn com.google.auto.service.AutoService
--dontwarn com.squareup.kotlinpoet.FileSpec
--dontwarn com.squareup.kotlinpoet.OriginatingElementsHolder
--dontwarn com.squareup.kotlinpoet.OriginatingElementsHolder$Builder
--dontwarn com.squareup.kotlinpoet.javapoet.J2kInteropKt
--dontwarn com.squareup.kotlinpoet.javapoet.K2jInteropKt
+# This is generated automatically by the Android Gradle plugin.
 -dontwarn java.beans.ConstructorProperties
 -dontwarn java.beans.Transient
--dontwarn javax.lang.model.SourceVersion
--dontwarn javax.lang.model.element.AnnotationMirror
--dontwarn javax.lang.model.element.AnnotationValue
--dontwarn javax.lang.model.element.AnnotationValueVisitor
--dontwarn javax.lang.model.element.Element
--dontwarn javax.lang.model.element.ElementKind
--dontwarn javax.lang.model.element.ElementVisitor
--dontwarn javax.lang.model.element.ExecutableElement
--dontwarn javax.lang.model.element.Modifier
--dontwarn javax.lang.model.element.Name
--dontwarn javax.lang.model.element.NestingKind
--dontwarn javax.lang.model.element.PackageElement
--dontwarn javax.lang.model.element.QualifiedNameable
--dontwarn javax.lang.model.element.TypeElement
--dontwarn javax.lang.model.element.TypeParameterElement
--dontwarn javax.lang.model.element.VariableElement
--dontwarn javax.lang.model.type.ArrayType
--dontwarn javax.lang.model.type.DeclaredType
--dontwarn javax.lang.model.type.ErrorType
--dontwarn javax.lang.model.type.ExecutableType
--dontwarn javax.lang.model.type.IntersectionType
--dontwarn javax.lang.model.type.NoType
--dontwarn javax.lang.model.type.NullType
--dontwarn javax.lang.model.type.PrimitiveType
--dontwarn javax.lang.model.type.TypeKind
--dontwarn javax.lang.model.type.TypeMirror
--dontwarn javax.lang.model.type.TypeVariable
--dontwarn javax.lang.model.type.TypeVisitor
--dontwarn javax.lang.model.type.UnionType
--dontwarn javax.lang.model.type.WildcardType
--dontwarn javax.lang.model.util.AbstractAnnotationValueVisitor8
--dontwarn javax.lang.model.util.AbstractElementVisitor8
--dontwarn javax.lang.model.util.AbstractTypeVisitor8
--dontwarn javax.lang.model.util.ElementFilter
--dontwarn javax.lang.model.util.Elements
--dontwarn javax.lang.model.util.SimpleAnnotationValueVisitor6
--dontwarn javax.lang.model.util.SimpleAnnotationValueVisitor7
--dontwarn javax.lang.model.util.SimpleAnnotationValueVisitor8
--dontwarn javax.lang.model.util.SimpleElementVisitor8
--dontwarn javax.lang.model.util.SimpleTypeVisitor7
--dontwarn javax.lang.model.util.SimpleTypeVisitor8
--dontwarn javax.lang.model.util.Types
--dontwarn javax.tools.Diagnostic$Kind
--dontwarn javax.tools.FileObject
--dontwarn javax.tools.JavaFileManager$Location
--dontwarn javax.tools.JavaFileObject
--dontwarn javax.tools.JavaFileObject$Kind
--dontwarn javax.tools.SimpleJavaFileObject
--dontwarn javax.tools.StandardLocation
 -dontwarn org.slf4j.impl.StaticLoggerBinder
 -dontwarn org.slf4j.impl.StaticMDCBinder
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -102,7 +102,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-libaddressinput = '0.0.2'
 wordpress-lint = "2.1.0"
-wordpress-mediapicker = '0.3.2'
+wordpress-mediapicker = 'trunk-a6366298f9c24516ec5da0c9948d45d07bdb7f06'
 wordpress-utils = '3.15.0'
 zendesk = '5.0.8'
 
@@ -209,7 +209,6 @@ google-dagger = { module = "com.google.dagger:dagger", version.ref = "google-dag
 google-dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "google-dagger" }
 google-dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "google-dagger" }
 google-dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "google-dagger" }
-google-dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "google-dagger" }
 google-dagger-hilt-android-main = { group = "com.google.dagger", name = "hilt-android", version.ref = "google-dagger" }
 google-dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "google-dagger" }
 google-dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "google-dagger" }