Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-badgers-align.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/expo': patch
---

Align Android OkHttp dependencies to compatible versions so Clerk native networking and React Native can run without a mixed OkHttp 4 and 5 classpath.
2 changes: 1 addition & 1 deletion integration/templates/expo-native/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"android": {
"package": "com.clerk.exponativebuildfixture"
},
"plugins": ["expo-secure-store", "@clerk/expo", "expo-web-browser", "./plugins/withClerkOkHttpAlignment.js"]
"plugins": ["expo-secure-store", "@clerk/expo", "expo-web-browser"]
}
}

This file was deleted.

14 changes: 13 additions & 1 deletion packages/expo/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ext {
kotlinxCoroutinesVersion = "1.7.3"
clerkAndroidApiVersion = "1.0.39"
clerkAndroidUiVersion = "1.0.39"
okhttpVersion = "5.4.0"
okhttpUrlConnectionVersion = "5.0.0-alpha.16"
composeVersion = "1.7.0"
activityComposeVersion = "1.9.0"
lifecycleVersion = "2.8.0"
Expand Down Expand Up @@ -107,7 +109,7 @@ dependencies {

// Clerk Android SDK with prebuilt UI
// Exclude kotlin-stdlib to prevent 2.3.0 from polluting the project
// Exclude okhttp to prevent version conflict with React Native's okhttp
// Exclude transitive OkHttp modules so the compatible versions below control resolution.
implementation("com.clerk:clerk-android-ui:$clerkAndroidUiVersion") {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
Expand All @@ -126,6 +128,16 @@ dependencies {
exclude group: 'com.squareup.okhttp3', module: 'okhttp-urlconnection'
}

implementation('com.squareup.okhttp3:okhttp') {
version { strictly(okhttpVersion) }
}
implementation('com.squareup.okhttp3:logging-interceptor') {
version { strictly(okhttpVersion) }
}
implementation('com.squareup.okhttp3:okhttp-urlconnection') {
version { strictly(okhttpUrlConnectionVersion) }
}

// Jetpack Compose for wrapping Clerk views
implementation "androidx.compose.ui:ui:$composeVersion"
implementation "androidx.compose.material3:material3:1.3.0"
Expand Down
Loading