Skip to content

Upgrade AndroidX Activity to 1.10.1 (#58689) #58689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Abbondanzo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade AndroidX Activity to 1.10.1 (#58689) #58689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-native/ReactAndroid/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
api(libs.androidx.activity)
api(libs.androidx.appcompat)
api(libs.androidx.appcompat.resources)
api(libs.androidx.autofill)
Expand Down
24 changes: 0 additions & 24 deletions ...Android/src/main/java/com/facebook/react/activityresult/ActivityResultLauncherCompat.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...Android/src/main/java/com/facebook/react/activityresult/DeferredActivityResultLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import com.facebook.react.common.ReactConstants
*/
internal class DeferredActivityResultLauncher<I>(
private val key: String,
contract: ActivityResultContract<I, *>,
override val contract: ActivityResultContract<I, *>,
private val onUnregister: () -> Unit,
private val onLaunchFailure: (RuntimeException) -> Unit = {},
) : ActivityResultLauncherCompat<I>(contract) {
) : ActivityResultLauncher<I>() {

private class PendingLaunch<I>(val input: I, val options: ActivityOptionsCompat?)

Expand Down
8 changes: 0 additions & 8 deletions ...roid/src/test/java/com/facebook/react/activityresult/ReactActivityResultCallerImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@ class ReactActivityResultCallerImplTest {
caller = ReactActivityResultCallerImpl(reactContext)
}

@Test
fun launcherExposesRegisteredContract() {
val contract = GetContent()
val launcher = caller.registerForActivityResult(moduleA, contract) {}

assertThat(launcher.contract).isSameAs(contract)
}

@Test
fun twoOwnersMayRegisterTheSameStockContract() {
caller.registerForActivityResult(moduleA, GetContent()) {}
Expand Down
4 changes: 3 additions & 1 deletion ...src/test/java/com/facebook/react/activityresult/ReactActivityResultCallerThreadingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.app.Activity
import android.content.ActivityNotFoundException
import android.os.Bundle
import android.os.Looper
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.ActivityResultRegistry
import androidx.activity.result.ActivityResultRegistryOwner
import androidx.activity.result.contract.ActivityResultContract
Expand Down Expand Up @@ -64,7 +65,8 @@ class ReactActivityResultCallerThreadingTest {
.orEmpty()
}

private class ThrowingLauncher : ActivityResultLauncherCompat<String>(GetContent()) {
private class ThrowingLauncher : ActivityResultLauncher<String>() {
override val contract: ActivityResultContract<String, *> = GetContent()
var launchCount = 0

override fun launch(input: String, options: ActivityOptionsCompat?) {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ buildTools = "37.0.0"
ndkVersion = "27.1.12297006"
# Dependencies versions
agp = "9.2.1"
androidx-activity = "1.10.1"
androidx-annotation = "1.6.0"
androidx-appcompat = "1.7.0"
androidx-autofill = "1.3.0"
Expand Down Expand Up @@ -52,6 +53,7 @@ gflags="2.2.0"
nlohmannjson="3.11.2"

[libraries]
androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
androidx-appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" }
Expand Down
Loading