fix: [SDK-4160] exclude OkHttp 5.x from OneSignal transitive dependencies (#1921)

Author: fadi-george

.cursor/rules/bun.mdc

@@ -18,5 +18,7 @@ jobs:
       github.event.pull_request.merged == true &&
       contains(github.event.pull_request.title, 'chore: Release')
     uses: OneSignal/sdk-shared/.github/workflows/publish-npm-github.yml@main
+    secrets:
+      GH_PUSH_TOKEN: ${{ secrets.GH_PUSH_TOKEN }}
     with:
       branch: ${{ github.event.pull_request.base.ref }}

.cursor/rules/pr-conventions.mdc

@@ -94,7 +94,7 @@ jobs:
 
           # Get versions from target branch (not the release branch)
           CURRENT_VERSION=$(git show origin/${{ inputs.target_branch }}:package.json | jq -r .version)
-          ANDROID_VERSION=$(git show origin/${{ inputs.target_branch }}:android/build.gradle | grep "api 'com.onesignal:OneSignal:" | sed -E "s/.*OneSignal:([0-9.]+).*/\1/")
+          ANDROID_VERSION=$(git show origin/${{ inputs.target_branch }}:android/build.gradle | grep "com.onesignal:OneSignal:" | sed -E "s/.*OneSignal:([0-9.]+).*/\1/")
           IOS_VERSION=$(git show origin/${{ inputs.target_branch }}:react-native-onesignal.podspec | grep "OneSignalXCFramework" | sed -E "s/.*'([0-9.]+)'.*/\1/")
 
           echo "rn_from=$CURRENT_VERSION" >> $GITHUB_OUTPUT
@@ -116,8 +116,8 @@ jobs:
             exit 1
           fi
 
-          # Update Android SDK version in build.gradle
-          sed -i '' "s/api 'com.onesignal:OneSignal:[^']*'/api 'com.onesignal:OneSignal:$VERSION'/" android/build.gradle
+          # Update Android SDK version in build.gradle (handles both api '...' and api('...') syntax)
+          sed -i '' -E "s/(com\.onesignal:OneSignal:)[0-9.]+/\1$VERSION/" android/build.gradle
           echo "✓ Updated android/build.gradle with Android SDK ${VERSION}"
 
           # Only commit if there are changes

.github/workflows/cd.yml

@@ -0,0 +1,13 @@
+name: Move Linear tickets to Deployed
+
+on:
+  release:
+    types: [published, edited]
+
+jobs:
+  linear-deployed:
+    uses: OneSignal/sdk-shared/.github/workflows/linear-deployed.yml@main
+    with:
+      release_body: ${{ github.event.release.body }}
+    secrets:
+      LINEAR_GITHUB_API_KEY: ${{ secrets.LINEAR_GITHUB_API_KEY }}

.github/workflows/create-release-pr.yml

@@ -32,7 +32,13 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:5.7.2'
-    
+    //
+    // Exclude OkHttp from OneSignal's transitive deps: the 5.7.x otel module pulls in OkHttp 5.x
+    // (via opentelemetry-exporter-sender-okhttp) which is binary-incompatible with React Native's
+    // networking stack (okhttp3.internal.Util removed in 5.x). React Native already provides OkHttp 4.x.
+    api('com.onesignal:OneSignal:5.7.2') {
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
+    }
+
     testImplementation 'junit:junit:4.12'
-}
+}

.github/workflows/linear-deployed.yml

@@ -109,12 +109,6 @@ android {
 
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
-configurations.all {
-    resolutionStrategy {
-        force 'com.squareup.okhttp3:okhttp:4.12.0'
-    }
-}
-
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")