Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pulling hotfix-release/1.22.0 into master #400

Merged
merged 2 commits into from
Sep 28, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/deploy-cocoapods.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Deploy to Cocoapods

on:
workflow_run:
workflows: ['Publish new github release']
types: ['completed']
release:
types: [created]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-private-pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
deploy_private_pod:
name: Deploy to Private Pod
runs-on: macOS-latest
if: (startsWith(github.event.client_payload.branch_name, 'release/') || startsWith(github.event.client_payload.branch_name, 'hotfix-release/'))
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/slack-notify.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: Notify Slack Channel

on:
workflow_run:
workflows: ['Deploy to Cocoapods']
types: ['completed']
release:
types: [created]

jobs:
deploy-tag:
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.22.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.20.0...v1.22.0) (2023-09-28)


### Features

* improvements of SQLite RETURNING clause ([00e5032](https://github.com/rudderlabs/rudder-sdk-ios/commit/00e5032f68bde1fe171278c979a080a21a8efa12))


### Bug Fixes

* crash on RSDBPersistentManager ([b645316](https://github.com/rudderlabs/rudder-sdk-ios/commit/b645316201caceec943dcbab8b220875e370d6f3))

## [1.21.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.20.0...v1.21.0) (2023-09-28)


Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<p align="center">
<a href="https://cocoapods.org/pods/Rudder">
<img src="https://img.shields.io/static/v1?label=pod&message=v1.21.0&color=blue&style=flat">
<img src="https://img.shields.io/static/v1?label=pod&message=v1.22.0&color=blue&style=flat">
</a>
</p>

Expand Down Expand Up @@ -39,15 +39,15 @@ The iOS SDK is available through [**CocoaPods**](https://cocoapods.org), [**Cart
To install the SDK, simply add the following line to your Podfile:

```xcode
pod 'Rudder', '1.21.0'
pod 'Rudder', '1.22.0'
```

### Carthage

For Carthage support, add the following line to your `Cartfile`:

```xcode
github "rudderlabs/rudder-sdk-ios" "v1.21.0"
github "rudderlabs/rudder-sdk-ios" "v1.22.0"
```

> Remember to include the following code in all `.m` and `.h` files where you want to refer to or use the RudderStack SDK classes, as shown:
Expand All @@ -71,7 +71,7 @@ You can also add the RudderStack iOS SDK via Swift Package Mangaer, via one of t

* Enter the package repository (`[email protected]:rudderlabs/rudder-sdk-ios.git`) in the search bar.

* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.21.0` as the value, as shown:
* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.22.0` as the value, as shown:

![Setting dependency](https://user-images.githubusercontent.com/59817155/145574696-8c849749-13e0-40d5-aacb-3fccb5c8e67d.png)

Expand Down Expand Up @@ -99,7 +99,7 @@ let package = Package(
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.21.0")
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.22.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Classes/Headers/RSVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
#ifndef RSVersion_h
#define RSVersion_h

NSString *const SDK_VERSION = @"1.21.0";
NSString *const SDK_VERSION = @"1.22.0";

#endif /* RSVersion_h */
2 changes: 1 addition & 1 deletion Sources/Classes/RSDBPersistentManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ - (NSNumber*)saveEvent:(NSString *)message {
if ([database step:insertStmt] == SQLITE_ROW) {
// table created
[RSLogger logDebug:@"RSDBPersistentManager: saveEvent: Successfully inserted event to table"];
rowId = sqlite3_column_int(insertStmt, 0);
rowId = [database column_int:insertStmt i:0];
} else {
[RSLogger logError:@"RSDBPersistentManager: saveEvent: Failed to insert the event"];
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "1.21.0",
"version": "1.22.0",
"description": "Rudder is a platform for collecting, storing and routing customer event data to dozens of tools"
}
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sonar.qualitygate.wait=false
sonar.projectKey=rudderlabs_rudder-sdk-ios
sonar.organization=rudderlabs
sonar.projectName=RudderStack iOS SDK
sonar.projectVersion=1.21.0
sonar.projectVersion=1.22.0

# C/C++/Objective-C related details
# sonar.cfamily.compile-commands=compile_commands.json
Expand Down
Loading