Skip to content

Commit 48b77e9

Browse files
nan-linan-li
authored
Merge pull request #1602 from OneSignal/branch_off_copy_of_main_for_cd_testing
wip: sample PR to test CD
2 parents 47972a4 + 3f4707e commit 48b77e9

2 files changed

Lines changed: 123 additions & 43 deletions

File tree

‎iOS_SDK/OneSignalSDK/build_all_frameworks.sh‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,69 @@ set -e
33

44
WORKING_DIR=$(pwd)
55

6-
create_xcframework() {
7-
FRAMEWORK_FOLDER_NAME=$1
6+
# create_xcframework() {
7+
# FRAMEWORK_FOLDER_NAME=$1
88

9-
FRAMEWORK_NAME=$2
9+
# FRAMEWORK_NAME=$2
1010

11-
FRAMEWORK_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/${FRAMEWORK_NAME}.xcframework"
11+
# FRAMEWORK_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/${FRAMEWORK_NAME}.xcframework"
1212

13-
BUILD_SCHEME=$3
13+
# BUILD_SCHEME=$3
1414

15-
SIMULATOR_ARCHIVE_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/simulator.xcarchive"
15+
# SIMULATOR_ARCHIVE_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/simulator.xcarchive"
1616

17-
IOS_DEVICE_ARCHIVE_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/iOS.xcarchive"
17+
# IOS_DEVICE_ARCHIVE_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/iOS.xcarchive"
1818

19-
CATALYST_ARCHIVE_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/catalyst.xcarchive"
19+
# CATALYST_ARCHIVE_PATH="${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}/catalyst.xcarchive"
2020

21-
rm -rf "${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}"
22-
echo "Deleted ${FRAMEWORK_FOLDER_NAME}"
23-
mkdir "${FRAMEWORK_FOLDER_NAME}"
24-
echo "Created ${FRAMEWORK_FOLDER_NAME}"
25-
echo "Archiving ${FRAMEWORK_NAME}"
21+
# rm -rf "${WORKING_DIR}/${FRAMEWORK_FOLDER_NAME}"
22+
# echo "Deleted ${FRAMEWORK_FOLDER_NAME}"
23+
# mkdir "${FRAMEWORK_FOLDER_NAME}"
24+
# echo "Created ${FRAMEWORK_FOLDER_NAME}"
25+
# echo "Archiving ${FRAMEWORK_NAME}"
2626

27-
xcodebuild -list
27+
# xcodebuild -list
2828

29-
xcodebuild archive ONLY_ACTIVE_ARCH=NO -scheme ${BUILD_SCHEME} -destination="generic/platform=iOS Simulator" -archivePath "${SIMULATOR_ARCHIVE_PATH}" -sdk iphonesimulator SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
29+
# xcodebuild archive ONLY_ACTIVE_ARCH=NO -scheme ${BUILD_SCHEME} -destination="generic/platform=iOS Simulator" -archivePath "${SIMULATOR_ARCHIVE_PATH}" -sdk iphonesimulator SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
3030

31-
xcodebuild archive -scheme ${BUILD_SCHEME} -destination="generic/platform=iOS" -archivePath "${IOS_DEVICE_ARCHIVE_PATH}" -sdk iphoneos SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
31+
# xcodebuild archive -scheme ${BUILD_SCHEME} -destination="generic/platform=iOS" -archivePath "${IOS_DEVICE_ARCHIVE_PATH}" -sdk iphoneos SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
3232

33-
xcodebuild archive -scheme ${BUILD_SCHEME} -destination='generic/platform=macOS,variant=Mac Catalyst' -archivePath "${CATALYST_ARCHIVE_PATH}" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
33+
# xcodebuild archive -scheme ${BUILD_SCHEME} -destination='generic/platform=macOS,variant=Mac Catalyst' -archivePath "${CATALYST_ARCHIVE_PATH}" SKIP_INSTALL=NO BUILD_LIBRARIES_FOR_DISTRIBUTION=YES
3434

35-
xcodebuild -create-xcframework -framework ${SIMULATOR_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework -debug-symbols ${SIMULATOR_ARCHIVE_PATH}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM -framework ${IOS_DEVICE_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework -debug-symbols ${IOS_DEVICE_ARCHIVE_PATH}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM -framework ${CATALYST_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework -debug-symbols ${CATALYST_ARCHIVE_PATH}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM -output "${FRAMEWORK_PATH}"
36-
rm -rf "${SIMULATOR_ARCHIVE_PATH}"
37-
rm -rf "${IOS_DEVICE_ARCHIVE_PATH}"
38-
rm -rf "${CATALYST_ARCHIVE_PATH}"
39-
}
35+
# xcodebuild -create-xcframework -framework ${SIMULATOR_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework -debug-symbols ${SIMULATOR_ARCHIVE_PATH}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM -framework ${IOS_DEVICE_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework -debug-symbols ${IOS_DEVICE_ARCHIVE_PATH}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM -framework ${CATALYST_ARCHIVE_PATH}/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework -debug-symbols ${CATALYST_ARCHIVE_PATH}/dSYMs/${FRAMEWORK_NAME}.framework.dSYM -output "${FRAMEWORK_PATH}"
36+
# rm -rf "${SIMULATOR_ARCHIVE_PATH}"
37+
# rm -rf "${IOS_DEVICE_ARCHIVE_PATH}"
38+
# rm -rf "${CATALYST_ARCHIVE_PATH}"
39+
# }
4040

41-
# BUILD ONESIGNAL CORE ##
42-
create_xcframework "OneSignal_Core" "OneSignalCore" "OneSignalCore"
41+
# # BUILD ONESIGNAL CORE ##
42+
# create_xcframework "OneSignal_Core" "OneSignalCore" "OneSignalCore"
4343

44-
## BUILD ONESIGNAL CORE ##
45-
create_xcframework "OneSignal_OSCore" "OneSignalOSCore" "OneSignalOSCore"
44+
# ## BUILD ONESIGNAL CORE ##
45+
# create_xcframework "OneSignal_OSCore" "OneSignalOSCore" "OneSignalOSCore"
4646

47-
## BUILD ONESIGNAL OUTCOMES ##
48-
create_xcframework "OneSignal_Outcomes" "OneSignalOutcomes" "OneSignalOutcomes"
47+
# ## BUILD ONESIGNAL OUTCOMES ##
48+
# create_xcframework "OneSignal_Outcomes" "OneSignalOutcomes" "OneSignalOutcomes"
4949

50-
## BUILD ONESIGNAL EXTENSION ##
51-
create_xcframework "OneSignal_Extension" "OneSignalExtension" "OneSignalExtension"
50+
# ## BUILD ONESIGNAL EXTENSION ##
51+
# create_xcframework "OneSignal_Extension" "OneSignalExtension" "OneSignalExtension"
5252

53-
## BUILD ONESIGNAL EXTENSION ##
54-
create_xcframework "OneSignal_Notifications" "OneSignalNotifications" "OneSignalNotifications"
53+
# ## BUILD ONESIGNAL EXTENSION ##
54+
# create_xcframework "OneSignal_Notifications" "OneSignalNotifications" "OneSignalNotifications"
5555

56-
## BUILD ONESIGNAL USER ##
57-
create_xcframework "OneSignal_User" "OneSignalUser" "OneSignalUser"
56+
# ## BUILD ONESIGNAL USER ##
57+
# create_xcframework "OneSignal_User" "OneSignalUser" "OneSignalUser"
5858

59-
## BUILD ONESIGNAL LIVE ACTIVITIES ##
60-
create_xcframework "OneSignal_LiveActivities" "OneSignalLiveActivities" "OneSignalLiveActivities"
59+
# ## BUILD ONESIGNAL LIVE ACTIVITIES ##
60+
# create_xcframework "OneSignal_LiveActivities" "OneSignalLiveActivities" "OneSignalLiveActivities"
6161

62-
## BUILD ONESIGNAL USER ##
63-
create_xcframework "OneSignal_Location" "OneSignalLocation" "OneSignalLocation"
62+
# ## BUILD ONESIGNAL USER ##
63+
# create_xcframework "OneSignal_Location" "OneSignalLocation" "OneSignalLocation"
6464

65-
## BUILD ONESIGNAL USER ##
66-
create_xcframework "OneSignal_InAppMessages" "OneSignalInAppMessages" "OneSignalInAppMessages"
65+
# ## BUILD ONESIGNAL USER ##
66+
# create_xcframework "OneSignal_InAppMessages" "OneSignalInAppMessages" "OneSignalInAppMessages"
6767

68-
## BUILD ONESIGNAL ##
69-
create_xcframework "OneSignal_XCFramework" "OneSignalFramework" "OneSignalFramework"
68+
# ## BUILD ONESIGNAL ##
69+
# create_xcframework "OneSignal_XCFramework" "OneSignalFramework" "OneSignalFramework"
7070

71-
open "${WORKING_DIR}"
71+
# open "${WORKING_DIR}"

‎iOS_SDK/OneSignalSDK/update_version.sh‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# Script to update the SDK version across the codebase
5+
# Updates: .podspec files and ONESIGNAL_VERSION
6+
# Usage: ./update_version.sh <version>
7+
8+
if [ -z "$1" ]; then
9+
echo "Error: Version number is required"
10+
echo "Usage: ./update_version.sh <version>"
11+
exit 1
12+
fi
13+
14+
VERSION=$1
15+
16+
WORKING_DIR=$(pwd)
17+
REPO_ROOT="${WORKING_DIR}/../.."
18+
19+
# Validate version format (supports X.Y.Z or X.Y.Z-suffix)
20+
if ! [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.*)?$ ]]; then
21+
echo "Error: Version must be in format X.Y.Z or X.Y.Z-suffix (e.g., 5.2.15 or 5.2.3-beta-01)"
22+
exit 1
23+
fi
24+
25+
# Convert semantic version to numeric version
26+
# Examples: "5.2.15" -> "050215", "5.2.3-beta-01" -> "050203-beta-01"
27+
convert_to_numeric() {
28+
local version=$1
29+
local version_part=""
30+
local suffix=""
31+
32+
# Split by dash to separate version and suffix
33+
if [[ $version == *"-"* ]]; then
34+
version_part="${version%%-*}"
35+
suffix="-${version#*-}"
36+
else
37+
version_part="$version"
38+
fi
39+
40+
# Split version by dots and pad each part to 2 digits
41+
IFS='.' read -r major minor patch <<< "$version_part"
42+
printf "%02d%02d%02d%s" "$major" "$minor" "$patch" "$suffix"
43+
}
44+
45+
VERSION_NUMERIC=$(convert_to_numeric "$VERSION")
46+
47+
ONESIGNAL_PODSPEC="${REPO_ROOT}/OneSignal.podspec"
48+
ONESIGNAL_XCFRAMEWORK_PODSPEC="${REPO_ROOT}/OneSignalXCFramework.podspec"
49+
ONESIGNAL_COMMON_DEFINES="${WORKING_DIR}/OneSignalCore/Source/OneSignalCommonDefines.h"
50+
51+
echo "Updating version to ${VERSION}..."
52+
53+
# Update OneSignal.podspec
54+
if [ -f "$ONESIGNAL_PODSPEC" ]; then
55+
sed -i '' "s/s\.version[[:space:]]*=[[:space:]]*\"[^\"]*\"/s.version = \"${VERSION}\"/" "$ONESIGNAL_PODSPEC"
56+
echo "✓ Updated OneSignal.podspec"
57+
else
58+
echo "Error: OneSignal.podspec not found at ${ONESIGNAL_PODSPEC}"
59+
exit 1
60+
fi
61+
62+
# Update OneSignalXCFramework.podspec
63+
if [ -f "$ONESIGNAL_XCFRAMEWORK_PODSPEC" ]; then
64+
sed -i '' "s/s\.version[[:space:]]*=[[:space:]]*\"[^\"]*\"/s.version = \"${VERSION}\"/" "$ONESIGNAL_XCFRAMEWORK_PODSPEC"
65+
echo "✓ Updated OneSignalXCFramework.podspec"
66+
else
67+
echo "Error: OneSignalXCFramework.podspec not found at ${ONESIGNAL_XCFRAMEWORK_PODSPEC}"
68+
exit 1
69+
fi
70+
71+
# Update OneSignalCommonDefines.h
72+
if [ -f "$ONESIGNAL_COMMON_DEFINES" ]; then
73+
sed -i '' "s/^#define ONESIGNAL_VERSION[[:space:]]*@\"[^\"]*\"/#define ONESIGNAL_VERSION @\"${VERSION_NUMERIC}\"/" "$ONESIGNAL_COMMON_DEFINES"
74+
echo "✓ Updated ONESIGNAL_VERSION in OneSignalCommonDefines.h to ${VERSION_NUMERIC}"
75+
else
76+
echo "Error: OneSignalCommonDefines.h not found at ${ONESIGNAL_COMMON_DEFINES}"
77+
exit 1
78+
fi
79+
80+
echo "Successfully updated version to ${VERSION} (numeric: ${VERSION_NUMERIC}) in all files"

0 commit comments

Comments
 (0)