From a09fef7c60ecf15f7a40af40ccf31b39ace963a3 Mon Sep 17 00:00:00 2001 From: Kitselyuk Egor Date: Fri, 5 Apr 2024 18:36:03 +0300 Subject: [PATCH 1/4] Bump SDK version to 2.8.4 --- CHANGELOG.md | 5 ++++- MindboxSdk.podspec | 4 ++-- android/build.gradle | 7 ------- package.json | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1a7821..29e9b49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog -## [2.8.3] - 2024-03-28 +## [Unreleased] + +### Changes +- upgrade iOS SDK dependency to v2.8.6 ## [2.8.3] - 2024-03-28 diff --git a/MindboxSdk.podspec b/MindboxSdk.podspec index 7193395..b415d35 100644 --- a/MindboxSdk.podspec +++ b/MindboxSdk.podspec @@ -17,6 +17,6 @@ Pod::Spec.new do |s| s.dependency "React-Core" - s.dependency "Mindbox", "2.8.5" - s.dependency "MindboxNotifications", "2.8.5" + s.dependency "Mindbox", "2.8.6" + s.dependency "MindboxNotifications", "2.8.6" end diff --git a/android/build.gradle b/android/build.gradle index 920ffbe..8b80a3c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -127,11 +127,4 @@ dependencies { api 'com.facebook.react:react-native:+' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api 'cloud.mindbox:mobile-sdk:2.8.5' - - api 'cloud.mindbox:mindbox-huawei:2.8.5' - api 'com.huawei.hms:push:6.11.0.300' - - api 'cloud.mindbox:mindbox-firebase:2.8.5' - api platform('com.google.firebase:firebase-bom:32.6.0') - api 'com.google.firebase:firebase-messaging' } diff --git a/package.json b/package.json index 18bb502..4dcbcae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mindbox-sdk", "version": "2.8.3", - "target-version": "2.8.3", + "target-version": "2.8.4", "description": "SDK for integration React Native mobile apps with Mindbox", "main": "lib/commonjs/index", "module": "lib/module/index", From aa2e589d14e87b89c0d82108af0b93d8161d1803 Mon Sep 17 00:00:00 2001 From: Kitselyuk Egor Date: Wed, 24 Apr 2024 14:52:49 +0300 Subject: [PATCH 2/4] Bump SDK version to 2.9.0 --- git-release-branch.sh | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 git-release-branch.sh diff --git a/git-release-branch.sh b/git-release-branch.sh new file mode 100755 index 0000000..726a31c --- /dev/null +++ b/git-release-branch.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +# Check if the parameter is provided +if [ $# -eq 0 ]; then + echo "Please provide the release version number as a parameter." + exit 1 +fi + +# Check if the version number matches the semver format +if ! [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+(-rc)?$ ]]; then + echo "The release version number does not match the semver format (X.Y.Z or X.Y.Z-rc)." + exit 1 +fi + +# Check the current Git branch +current_branch=$(git symbolic-ref --short HEAD) + +if [[ $current_branch != "develop" && ! $current_branch =~ ^release/[0-9]+\.[0-9]+\.[0-9]+(-rc)?$ ]]; then + echo "The current Git branch ($current_branch) is not 'develop' or in the format 'release/X.Y.Z' or 'release/X.Y.Z-rc'." + exit 1 +fi + +# Create a branch with the version name +version=$1 +branch_name="release/$version" +git branch $branch_name +git checkout $branch_name + +# Add changelog to the index and create a commit +properties_file="gradle.properties" +current_version=$(grep -E '^SDK_VERSION_NAME=' gradle.properties | cut -d'=' -f2) +sed -i '' "s/^SDK_VERSION_NAME=.*/SDK_VERSION_NAME=$version/" $properties_file + +echo "Bump SDK version from $current_version to $version." + +git add $properties_file +git commit -m "Bump SDK version to $version" + +echo "Branch $branch_name has been created." From 76909522417d22b63b561f21dab994a6e3fa8e77 Mon Sep 17 00:00:00 2001 From: Kitselyuk Egor Date: Wed, 24 Apr 2024 15:24:00 +0300 Subject: [PATCH 3/4] Bump SDK version to 2.9.0 --- CHANGELOG.md | 7 ++++++- MindboxSdk.podspec | 4 ++-- android/build.gradle | 2 +- git-release-branch.sh | 11 +++++------ package.json | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29e9b49..8a8fd3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ ## [Unreleased] -### Changes +- Added new in-app templates: a modal window and a snackbar, when clicked on, a system window opens to request push notifications. +- Added new targeting based on user login frequency. +- Upgrade iOS SDK dependency to v2.9.0. +- Upgrade Android SDK dependency to v2.9.0. + +### [2.8.4] - 2024-04-05 - upgrade iOS SDK dependency to v2.8.6 ## [2.8.3] - 2024-03-28 diff --git a/MindboxSdk.podspec b/MindboxSdk.podspec index b415d35..0931dcc 100644 --- a/MindboxSdk.podspec +++ b/MindboxSdk.podspec @@ -17,6 +17,6 @@ Pod::Spec.new do |s| s.dependency "React-Core" - s.dependency "Mindbox", "2.8.6" - s.dependency "MindboxNotifications", "2.8.6" + s.dependency "Mindbox", "2.9.0" + s.dependency "MindboxNotifications", "2.9.0" end diff --git a/android/build.gradle b/android/build.gradle index 8b80a3c..a5814ad 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -126,5 +126,5 @@ dependencies { // noinspection GradleDynamicVersion api 'com.facebook.react:react-native:+' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - api 'cloud.mindbox:mobile-sdk:2.8.5' + api 'cloud.mindbox:mobile-sdk:2.9.0' } diff --git a/git-release-branch.sh b/git-release-branch.sh index 726a31c..ac20e58 100755 --- a/git-release-branch.sh +++ b/git-release-branch.sh @@ -26,14 +26,13 @@ branch_name="release/$version" git branch $branch_name git checkout $branch_name -# Add changelog to the index and create a commit -properties_file="gradle.properties" -current_version=$(grep -E '^SDK_VERSION_NAME=' gradle.properties | cut -d'=' -f2) -sed -i '' "s/^SDK_VERSION_NAME=.*/SDK_VERSION_NAME=$version/" $properties_file +package_json="package.json" +current_version=$(grep -Eo '"target-version": "[^"]+"' $package_json | cut -d '"' -f 4) +sed -i '' "s/\"target-version\": \".*\"/\"target-version\": \"$version\"/" $package_json echo "Bump SDK version from $current_version to $version." -git add $properties_file -git commit -m "Bump SDK version to $version" +git add $package_json +git commit -m "Bump SDK version to $version" --no-verify echo "Branch $branch_name has been created." diff --git a/package.json b/package.json index 4dcbcae..e8fff8a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mindbox-sdk", "version": "2.8.3", - "target-version": "2.8.4", + "target-version": "2.9.0", "description": "SDK for integration React Native mobile apps with Mindbox", "main": "lib/commonjs/index", "module": "lib/module/index", From 946f20b8e372f7f5519b7f554cd4c9fbfd592cf5 Mon Sep 17 00:00:00 2001 From: Kitselyuk Egor Date: Sat, 27 Apr 2024 11:45:37 +0300 Subject: [PATCH 4/4] Bump SDK version to 2.9.1 --- CHANGELOG.md | 3 ++- android/build.gradle | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a8fd3e..1835f74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,11 @@ ## [Unreleased] +### Changes - Added new in-app templates: a modal window and a snackbar, when clicked on, a system window opens to request push notifications. - Added new targeting based on user login frequency. - Upgrade iOS SDK dependency to v2.9.0. -- Upgrade Android SDK dependency to v2.9.0. +- Upgrade Android SDK dependency to v2.9.1. ### [2.8.4] - 2024-04-05 - upgrade iOS SDK dependency to v2.8.6 diff --git a/android/build.gradle b/android/build.gradle index a5814ad..8513394 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -126,5 +126,5 @@ dependencies { // noinspection GradleDynamicVersion api 'com.facebook.react:react-native:+' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - api 'cloud.mindbox:mobile-sdk:2.9.0' + api 'cloud.mindbox:mobile-sdk:2.9.1' } diff --git a/package.json b/package.json index e8fff8a..883b09d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mindbox-sdk", "version": "2.8.3", - "target-version": "2.9.0", + "target-version": "2.9.1", "description": "SDK for integration React Native mobile apps with Mindbox", "main": "lib/commonjs/index", "module": "lib/module/index",