Skip to content

Commit

Permalink
chore(release): pulling release/1.23.0 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
desusai7 authored Oct 9, 2023
2 parents 0bddf54 + 6b9f121 commit 29be8d6
Show file tree
Hide file tree
Showing 15 changed files with 221 additions and 95 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy-cocoapods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
build:
name: Deploy to Cocoapods
runs-on: macOS-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Checkout source branch
uses: actions/checkout@v4
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/deploy-private-pod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,22 @@ jobs:
runs-on: macOS-latest
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/'))
steps:
- name: Checkout
- name: 'Checkout'
uses: actions/checkout@v4
with:
ref: '${{ github.event.pull_request.head.ref }}'

- name: Install Cocoapods
- name: 'Install Cocoapods'
run: gem install cocoapods

- name: 'Convert podspec to podspec.json'
run: |
pod ipc spec Rudder.podspec > Rudder.podspec.json
- name: Add Private Spec Repo to CocoaPods installation
- name: 'Add Private Spec Repo to CocoaPods installation'
run: |
pod repo add Rudder https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git
pod repo add rudderlabs https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git
- name: Add Podspec to repo
- name: 'Add Podspec to repo'
run: |
pod repo push Rudder Rudder.podspec
pod repo push rudderlabs Rudder.podspec.json
16 changes: 10 additions & 6 deletions .github/workflows/draft-new-beta-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,22 @@ jobs:
run: |
git push
- name: Checkout
- name: 'Checkout'
uses: actions/checkout@v4
with:
ref: '${{ steps.create-release.outputs.branch_name }}'

- name: Install Cocoapods
- name: 'Install Cocoapods'
run: gem install cocoapods

- name: Add Private Spec Repo to CocoaPods installation
- name: 'Convert podspec to podspec.json'
run: |
pod repo add Rudder https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git
pod ipc spec Rudder.podspec > Rudder.podspec.json
- name: Add Podspec to repo
- name: 'Add Private Spec Repo to CocoaPods installation'
run: |
pod repo push Rudder Rudder.podspec
pod repo add rudderlabs https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git
- name: 'Add Podspec to repo'
run: |
pod repo push rudderlabs Rudder.podspec.json
1 change: 0 additions & 1 deletion .github/workflows/slack-notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
deploy-tag:
name: Notify Slack
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Send message to Slack channel
id: slack
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.23.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.22.0...v1.23.0) (2023-10-09)


### Features

* metrics for DMT and DBEncryption ([#404](https://github.com/rudderlabs/rudder-sdk-ios/issues/404)) ([e863f72](https://github.com/rudderlabs/rudder-sdk-ios/commit/e863f72f9f53e4600d1de074bbb9591c2337153a))


### Bug Fixes

* fixed issues related to DBEncryption in RSDBPersistentManager and enhanced error handling ([#403](https://github.com/rudderlabs/rudder-sdk-ios/issues/403)) ([2e9c2cf](https://github.com/rudderlabs/rudder-sdk-ios/commit/2e9c2cf0bbac631bfa960adc778c044b3368d709))

## [1.22.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.20.0...v1.22.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.22.0&color=blue&style=flat">
<img src="https://img.shields.io/static/v1?label=pod&message=v1.23.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.22.0'
pod 'Rudder', '1.23.0'
```

### Carthage

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

```xcode
github "rudderlabs/rudder-sdk-ios" "v1.22.0"
github "rudderlabs/rudder-sdk-ios" "v1.23.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.22.0` as the value, as shown:
* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.23.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.22.0")
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.23.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 Rudder.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Pod::Spec.new do |s|

s.homepage = "https://github.com/rudderlabs/rudder-sdk-ios"
s.license = { :type => "Apache", :file => "LICENSE" }
s.author = { "RudderStack" => "arnab@rudderlabs.com" }
s.author = { "RudderStack" => "sdk@rudderstack.com" }
s.source = { :git => "https://github.com/rudderlabs/rudder-sdk-ios.git", :tag => "v#{s.version}" }

s.ios.deployment_target = '12.0'
Expand Down
11 changes: 11 additions & 0 deletions Sources/Classes/Headers/Public/RSMetricsReporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ extern NSString *const SDKMETRICS_SC_ATTEMPT_ABORT;
extern NSString *const SDKMETRICS_CM_ATTEMPT_SUCCESS;
extern NSString *const SDKMETRICS_CM_ATTEMPT_RETRY;
extern NSString *const SDKMETRICS_CM_ATTEMPT_ABORT;
extern NSString *const SDKMETRICS_DMT_SUBMITTED;
extern NSString *const SDKMETRICS_DMT_SUCCESS;
extern NSString *const SDKMETRICS_DMT_DISCARD;
extern NSString *const SDKMETRICS_DMT_RETRY;
extern NSString *const SDKMETRICS_DB_ENCRYPT;

extern NSString *const SDKMETRICS_TYPE;
extern NSString *const SDKMETRICS_OPT_OUT;
Expand All @@ -50,6 +55,12 @@ extern NSString *const SDKMETRICS_SOURCE_DISABLED;
extern NSString *const SDKMETRICS_WRITEKEY_INVALID;
extern NSString *const SDKMETRICS_INTEGRATION;
extern NSString *const SDKMETRICS_REQUEST_TIMEOUT;
extern NSString *const SDKMETRICS_CREATED;
extern NSString *const SDKMETRICS_MIGRATE_TO_ENCRYPT;
extern NSString *const SDKMETRICS_MIGRATE_TO_DECRYPT;
extern NSString *const SDKMETRICS_RESOURCE_NOT_FOUND;
extern NSString *const SDKMETRICS_BAD_REQUEST;
extern NSString *const SDKMETRICS_MAX_RETRIES_EXHAUSTED;

@end

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.22.0";
NSString *const SDK_VERSION = @"1.23.0";

#endif /* RSVersion_h */
Loading

0 comments on commit 29be8d6

Please sign in to comment.