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
14 changes: 0 additions & 14 deletions .cursor/rules/bun.mdc

This file was deleted.

32 changes: 0 additions & 32 deletions .cursor/rules/pr-conventions.mdc

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/linear-deployed.yml
Original file line number Diff line number Diff line change
@@ -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 }}
12 changes: 9 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
6 changes: 0 additions & 6 deletions examples/demo/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading