diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 188aed43..68823444 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -115,14 +115,10 @@ jobs: VERSION="${{ inputs.android_version }}" # Validate version exists on GitHub - # -sf: silent + fail on HTTP >= 400 so RELEASE stays empty - # on 404, otherwise GitHub's JSON error body would defeat the - # `[ -z ]` guard below. - RELEASE=$(curl -sf -H "Authorization: token ${{ github.token }}" \ - "https://api.github.com/repos/OneSignal/OneSignal-Android-SDK/releases/tags/${VERSION}" || true) - - - if [ -z "$RELEASE" ]; then + if ! curl --fail --silent --show-error --retry 4 --retry-delay 30 \ + -H "Authorization: token ${{ github.token }}" \ + "https://api.github.com/repos/OneSignal/OneSignal-Android-SDK/releases/tags/${VERSION}" \ + >/dev/null; then echo "✗ Android SDK version ${VERSION} not found" exit 1 fi @@ -145,13 +141,10 @@ jobs: VERSION="${{ inputs.ios_version }}" # Validate version exists on GitHub - # -sf: silent + fail on HTTP >= 400 so RELEASE stays empty - # on 404, otherwise GitHub's JSON error body would defeat the - # `[ -z ]` guard below. - RELEASE=$(curl -sf -H "Authorization: token ${{ github.token }}" \ - "https://api.github.com/repos/OneSignal/OneSignal-iOS-SDK/releases/tags/${VERSION}" || true) - - if [ -z "$RELEASE" ]; then + if ! curl --fail --silent --show-error --retry 4 --retry-delay 30 \ + -H "Authorization: token ${{ github.token }}" \ + "https://api.github.com/repos/OneSignal/OneSignal-iOS-SDK/releases/tags/${VERSION}" \ + >/dev/null; then echo "✗ iOS SDK version ${VERSION} not found" exit 1 fi diff --git a/android/build.gradle b/android/build.gradle index 9294fd91..3829bc30 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,7 +17,7 @@ def safeFlagGet(envProp, gradleProp) { return normalizedValue != null && (normalizedValue.equalsIgnoreCase('true') || normalizedValue == '1') } -def oneSignalVersion = '5.9.6' +def oneSignalVersion = '5.9.7' def oneSignalDisableLocation = safeFlagGet('ONESIGNAL_DISABLE_LOCATION', 'onesignal.disableLocation') android { diff --git a/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java b/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java index 0360972d..cf341ab0 100644 --- a/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java +++ b/android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java @@ -236,7 +236,7 @@ public void invalidate() { @Override public void initialize(String appId) { OneSignalWrapper.setSdkType("reactnative"); - OneSignalWrapper.setSdkVersion("050504"); + OneSignalWrapper.setSdkVersion("050505"); if (oneSignalInitDone) { Logging.debug("Already initialized the OneSignal React-Native SDK", null); diff --git a/examples/demo/bun.lock b/examples/demo/bun.lock index 91f58191..421fc187 100644 --- a/examples/demo/bun.lock +++ b/examples/demo/bun.lock @@ -1006,7 +1006,7 @@ "react-native-dotenv": ["react-native-dotenv@3.4.11", "", { "dependencies": { "dotenv": "^16.4.5" }, "peerDependencies": { "@babel/runtime": "^7.20.6" } }, "sha512-6vnIE+WHABSeHCaYP6l3O1BOEhWxKH6nHAdV7n/wKn/sciZ64zPPp2NUdEUf1m7g4uuzlLbjgr+6uDt89q2DOg=="], - "react-native-onesignal": ["react-native-onesignal@../../react-native-onesignal.tgz", { "dependencies": { "invariant": "^2.2.4" }, "peerDependencies": { "react-native": ">=0.79.0" } }, "sha512-o+lxVSnw3dtr085Pd68gQlWeF23DHHtW8dpGU5T3Wf9WgKVZuTkF/EnAegn5hzd9sekxPk/2OR3Un1mLQTUEog=="], + "react-native-onesignal": ["react-native-onesignal@../../react-native-onesignal.tgz", { "dependencies": { "invariant": "^2.2.4" }, "peerDependencies": { "react-native": ">=0.79.0" } }, "sha512-eteqP3QsKjnV9IGAaPINFFBLEVfpYwiYah5cM0uVvro47z67gsm6Hm5x8L/CkzZePojnkbwmpHx5mHU2/CRd7g=="], "react-native-safe-area-context": ["react-native-safe-area-context@5.7.0", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-/9/MtQz8ODphjsLdZ+GZAIcC/RtoqW9EeShf7Uvnfgm/pzYrJ75y3PV/J1wuAV1T5Dye5ygq4EAW20RoBq0ABQ=="], diff --git a/examples/demo/ios/Podfile.lock b/examples/demo/ios/Podfile.lock index 13b2e3d7..19819d57 100644 --- a/examples/demo/ios/Podfile.lock +++ b/examples/demo/ios/Podfile.lock @@ -3,9 +3,9 @@ PODS: - hermes-engine (250829098.0.7): - hermes-engine/Pre-built (= 250829098.0.7) - hermes-engine/Pre-built (250829098.0.7) - - OneSignalXCFramework (5.5.4): - - OneSignalXCFramework/OneSignalComplete (= 5.5.4) - - OneSignalXCFramework/OneSignal (5.5.4): + - OneSignalXCFramework (5.5.5): + - OneSignalXCFramework/OneSignalComplete (= 5.5.5) + - OneSignalXCFramework/OneSignal (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalExtension - OneSignalXCFramework/OneSignalLiveActivities @@ -13,41 +13,41 @@ PODS: - OneSignalXCFramework/OneSignalOSCore - OneSignalXCFramework/OneSignalOutcomes - OneSignalXCFramework/OneSignalUser - - OneSignalXCFramework/OneSignalComplete (5.5.4): + - OneSignalXCFramework/OneSignalComplete (5.5.5): - OneSignalXCFramework/OneSignal - OneSignalXCFramework/OneSignalInAppMessages - OneSignalXCFramework/OneSignalLocation - - OneSignalXCFramework/OneSignalCore (5.5.4) - - OneSignalXCFramework/OneSignalExtension (5.5.4): + - OneSignalXCFramework/OneSignalCore (5.5.5) + - OneSignalXCFramework/OneSignalExtension (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalOSCore - OneSignalXCFramework/OneSignalOutcomes - - OneSignalXCFramework/OneSignalInAppMessages (5.5.4): + - OneSignalXCFramework/OneSignalInAppMessages (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalNotifications - OneSignalXCFramework/OneSignalOSCore - OneSignalXCFramework/OneSignalOutcomes - OneSignalXCFramework/OneSignalUser - - OneSignalXCFramework/OneSignalLiveActivities (5.5.4): + - OneSignalXCFramework/OneSignalLiveActivities (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalOSCore - OneSignalXCFramework/OneSignalUser - - OneSignalXCFramework/OneSignalLocation (5.5.4): + - OneSignalXCFramework/OneSignalLocation (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalNotifications - OneSignalXCFramework/OneSignalOSCore - OneSignalXCFramework/OneSignalUser - - OneSignalXCFramework/OneSignalNotifications (5.5.4): + - OneSignalXCFramework/OneSignalNotifications (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalExtension - OneSignalXCFramework/OneSignalOSCore - OneSignalXCFramework/OneSignalOutcomes - - OneSignalXCFramework/OneSignalOSCore (5.5.4): + - OneSignalXCFramework/OneSignalOSCore (5.5.5): - OneSignalXCFramework/OneSignalCore - - OneSignalXCFramework/OneSignalOutcomes (5.5.4): + - OneSignalXCFramework/OneSignalOutcomes (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalOSCore - - OneSignalXCFramework/OneSignalUser (5.5.4): + - OneSignalXCFramework/OneSignalUser (5.5.5): - OneSignalXCFramework/OneSignalCore - OneSignalXCFramework/OneSignalNotifications - OneSignalXCFramework/OneSignalOSCore @@ -1449,9 +1449,9 @@ PODS: - React-RCTFBReactNativeSpec - ReactCommon/turbomodule/core - ReactNativeDependencies - - react-native-onesignal (5.5.4): + - react-native-onesignal (5.5.5): - hermes-engine - - OneSignalXCFramework (= 5.5.4) + - OneSignalXCFramework (= 5.5.5) - RCTRequired - RCTTypeSafety - React-Core @@ -2315,7 +2315,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FBLazyVector: c12d2108050e27952983d565a232f6f7b1ad5e69 hermes-engine: 431876dbea22ba6821b0e999131ecbf5d706c8d2 - OneSignalXCFramework: 5666b415b2cedb51b18643c05a65b4349ef015dc + OneSignalXCFramework: 48e5b7c5b51d4e67bab3405229f963efde1a3894 RCTDeprecation: 3280799c14232a56e5a44f92981a8ee33bc69fd9 RCTRequired: 9854a51b0f65ccf43ea0b744df4d70fce339db32 RCTSwiftUI: 96986e49a4fdc2c2103929dee2641e1b57edf33d @@ -2352,7 +2352,7 @@ SPEC CHECKSUMS: React-logger: 9e51e01455f15cb3ef87a09a1ec773cdb22d56c1 React-Mapbuffer: 92b99e450e8ff598b27d6e4db3a75e04fd45e9a9 React-microtasksnativemodule: 2fe0f2bd2840dedbd66c0ac249c64f977f39cc18 - react-native-onesignal: 08bf4ec87d9bbb42298a88d8ff9b499d608f73c0 + react-native-onesignal: 3f6c073f3bbe1f6349a931a7a7e5bac222a6b0ed react-native-safe-area-context: ae7587b95fb580d1800c5b0b2a7bd48c2868e67a React-NativeModulesApple: 44a9474594566cd03659f92e38f42599c6b9dee4 React-networking: db73d91466cb134fcbdaaa579fb2de14e2c2ea01 @@ -2396,4 +2396,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f62fbda480f1d76e1eac7d980b0960570d6cfe89 -COCOAPODS: 1.16.2 +COCOAPODS: 1.17.0 diff --git a/ios/RCTOneSignal/RCTOneSignal.mm b/ios/RCTOneSignal/RCTOneSignal.mm index 11e8b98c..b0afdcd7 100644 --- a/ios/RCTOneSignal/RCTOneSignal.mm +++ b/ios/RCTOneSignal/RCTOneSignal.mm @@ -23,7 +23,7 @@ - (void)initOneSignal:(NSDictionary *)launchOptions { return; OneSignalWrapper.sdkType = @"reactnative"; - OneSignalWrapper.sdkVersion = @"050504"; + OneSignalWrapper.sdkVersion = @"050505"; // initialize the SDK with a nil app ID so cold start click listeners can be // triggered [OneSignal initialize:nil withLaunchOptions:launchOptions]; diff --git a/package.json b/package.json index 79f09ebd..b396ef0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-onesignal", - "version": "5.5.4", + "version": "5.5.5", "description": "React Native OneSignal SDK", "keywords": [ "android", diff --git a/react-native-onesignal.podspec b/react-native-onesignal.podspec index 15e6117d..b0385059 100644 --- a/react-native-onesignal.podspec +++ b/react-native-onesignal.podspec @@ -1,6 +1,6 @@ require 'json' package_json = JSON.parse(File.read('package.json')) -onesignal_xcframework_version = '5.5.4' +onesignal_xcframework_version = '5.5.5' onesignal_disable_location_env = ENV['ONESIGNAL_DISABLE_LOCATION'].to_s.strip.downcase onesignal_disable_location = ['true', '1'].include?(onesignal_disable_location_env)