Merge pull request #199 from bumptech/master

Create a new pull request by comparing changes across two branches
AndroidKotlinID · Aug 23, 2023 · 0a37cb4 · 0a37cb4
2 parents 9793ac6 + e5479dc
commit 0a37cb4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/integration/avif/build.gradle b/integration/avif/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     implementation project(':library')
-    implementation 'org.aomedia.avif.android:avif:0.11.1.3c786d2'
+    implementation 'org.aomedia.avif.android:avif:0.11.1.647c3c2'
     implementation libs.guava
 
     annotationProcessor project(':annotation:compiler')

diff --git a/settings.gradle b/settings.gradle
@@ -55,8 +55,8 @@ dependencyResolutionManagement {
 
             // Versions for dependencies
             version('compose', '1.5.0')
-            version('coroutines', '1.7.2')
-            version('dagger', '2.46.1')
+            version('coroutines', '1.7.3')
+            version('dagger', '2.47')
             version('errorprone', '2.18.0')
             version('kotlin', '1.7.0')
             version('mockito', '5.3.1')
@@ -94,23 +94,23 @@ dependencyResolutionManagement {
             library('androidx-junit', 'androidx.test.ext:junit:1.1.5')
             library('androidx-recyclerview','androidx.recyclerview:recyclerview:1.2.1')
             library('androidx-test.core', 'androidx.test:core:1.4.0')
-            library('androidx-test.ktx', 'androidx.test:core-ktx:1.4.0')
+            library('androidx-test.ktx', 'androidx.test:core-ktx:1.5.0')
             library('androidx-test.ktx.junit', 'androidx.test.ext:junit-ktx:1.1.5')
             library('androidx-test.rules', 'androidx.test:rules:1.4.0')
             library('androidx-test.runner', 'androidx.test:runner:1.4.0')
             library('androidx-tracing', 'androidx.tracing:tracing:1.0.0')
             library('androidx.vectordrawable', 'androidx.vectordrawable:vectordrawable-animated:1.1.0')
             library('proguard-gradle', 'com.guardsquare:proguard-gradle:7.1.0')
             library('compose-foundation', 'androidx.compose.foundation', 'foundation').versionRef('compose')
-            library('compose-material', 'androidx.compose.material:material:1.3.1')
+            library('compose-material', 'androidx.compose.material:material:1.5.0')
             library('compose-ui', 'androidx.compose.ui', 'ui').versionRef('compose')
             library('compose-ui.testmanifest', 'androidx.compose.ui', 'ui-test-manifest').versionRef('compose')
             library('compose-ui.testjunit4', 'androidx.compose.ui', 'ui-test-junit4').versionRef('compose')
             library('coroutines-binarycompat.gradle', 'org.jetbrains.kotlinx:binary-compatibility-validator:0.11.0')
             library('coroutines-android', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-android').versionRef('coroutines')
             library('coroutines-core', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-core').versionRef('coroutines')
             library('coroutines-test', 'org.jetbrains.kotlinx', 'kotlinx-coroutines-test').versionRef('coroutines')
-            library('cronet', 'com.google.android.gms:play-services-cronet:17.0.0')
+            library('cronet', 'com.google.android.gms:play-services-cronet:17.0.1')
             library('dagger', 'com.google.dagger', 'dagger').versionRef('dagger')
             library('dagger-compiler', 'com.google.dagger', 'dagger-compiler').versionRef('dagger')
             library('dagger-android', 'com.google.dagger', 'dagger-android').versionRef('dagger')
@@ -148,9 +148,9 @@ dependencyResolutionManagement {
             library('rx-android', 'io.reactivex:rxandroid:1.2.1')
             library('rx-java', 'io.reactivex:rxjava:1.3.4')
             library('svg', 'com.caverock:androidsvg:1.2.1')
-            library('truth', 'com.google.truth:truth:1.1.3')
+            library('truth', 'com.google.truth:truth:1.1.5')
             library('violations', 'se.bjurr.violations:violations-gradle-plugin:1.8')
-            library('volley', 'com.android.volley:volley:1.2.0')
+            library('volley', 'com.android.volley:volley:1.2.1')
         }
     }
 }