Bump a few deps

Diffs=
edf7d7b86 Bump a few deps (#7459)

Co-authored-by: Umberto Sonnino <[email protected]>

.rive_head

@@ -1 +1 @@
-e66e242c649e3e61f12a3adbd824bcd9a7525a53
+edf7d7b86feb58294a1ba21342cfb619c7930bb6

app/build.gradle

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         applicationId "app.rive.runtime.example"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -67,29 +67,29 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation 'androidx.fragment:fragment-ktx:1.8.0'
     debugImplementation project(path: ':kotlin')
     releaseImplementation project(path: ':kotlin')
     previewImplementation 'app.rive:rive-android:+'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'androidx.activity:activity-compose:1.8.2'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.2'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.activity:activity-compose:1.9.0'
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.2.0'
+    implementation 'androidx.compose.material3:material3:1.2.1'
     implementation 'androidx.startup:startup-runtime:1.1.1'
     implementation 'com.android.volley:volley:1.2.1'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.9.22'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:2.0.0'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.6.2'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.6.8'
     androidTestImplementation project(path: ':kotlin')
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
-}
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
+}

app/src/androidTest/java/app/rive/runtime/example/DeviceRunner.kt

@@ -8,17 +8,14 @@ import org.junit.runners.model.Statement
 annotation class OnDevice
 
 class RunOnDevice(testClass: Class<*>) : BlockJUnit4ClassRunner(testClass) {
-    @Throws(InitializationError::class)
-    constructor(testClass: Class<*>, notifier: RunNotifier) : this(testClass)
-
     override fun methodBlock(method: FrameworkMethod): Statement {
         return object : Statement() {
-            @Throws(Throwable::class)
+            @Throws(Exception::class)
             override fun evaluate() {
                 // Check whether this is an emulator. If it is skip the test.
                 assumeFalse(TestUtils.isProbablyRunningOnEmulator)
                 // Continue with the usual test
-                method.invokeExplosively(testClass.javaClass.newInstance())
+                method.invokeExplosively(testClass.javaClass.getDeclaredConstructor().newInstance())
             }
         }
     }

build.gradle

@@ -11,10 +11,10 @@ ext {
 }
 buildscript {
     ext {
-        gradle_version = '8.3.2'
+        gradle_version = '8.5.0'
         kotlin_version = '1.9.22'
         dokkaVersion = "1.4.30"
-        compose_version = '1.6.2'
+        compose_version = '1.6.7'
     }
 
     repositories {

compatibilitytest/build.gradle

@@ -41,9 +41,9 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     implementation project(path: ':kotlin')

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Oct 13 16:33:42 BST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

kotlin/build.gradle

@@ -53,8 +53,8 @@ dependencies {
     implementation 'com.android.volley:volley:1.2.1'
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.getkeepsafe.relinker:relinker:1.4.5'
     implementation 'androidx.startup:startup-runtime:1.1.1'
 
@@ -64,7 +64,7 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.9.22"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:2.0.0"
 }
 
 // Commenting this out, this only really helps when you're doing local dev, but it means our git actions need abd!

kotlin/src/main/java/app/rive/runtime/kotlin/RiveAnimationView.kt

@@ -16,7 +16,7 @@ import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ViewTreeLifecycleOwner
+import androidx.lifecycle.findViewTreeLifecycleOwner
 import app.rive.runtime.kotlin.ResourceType.Companion.makeMaybeResource
 import app.rive.runtime.kotlin.controllers.ControllerState
 import app.rive.runtime.kotlin.controllers.ControllerStateManagement
@@ -837,7 +837,7 @@ open class RiveAnimationView(context: Context, attrs: AttributeSet? = null) :
      * Calling addObserver again will trigger a onCreate/onStart/onResume again.
      */
     private fun validateLifecycleOwner() {
-        val currentLifecycleOwner = ViewTreeLifecycleOwner.get(this)
+        val currentLifecycleOwner = this.findViewTreeLifecycleOwner()
         currentLifecycleOwner?.let {
             if (it != lifecycleOwner) {
                 lifecycleOwner?.lifecycle?.removeObserver(lifecycleObserver)