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 release/1.26.2 into master #501

Merged
merged 6 commits into from
Apr 9, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
uses: actions/checkout@v4

- name: Check PR title
uses: rudderlabs/[email protected].7
uses: rudderlabs/[email protected].11
2 changes: 1 addition & 1 deletion .github/workflows/create-hotfix-branch-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: github.ref == 'refs/heads/master-v2'
steps:
- name: Create branch
uses: peterjgrainger/action-create-branch@v2.4.0
uses: peterjgrainger/action-create-branch@v3.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-hotfix-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: github.ref == 'refs/heads/master'
steps:
- name: Create branch
uses: peterjgrainger/action-create-branch@v2.4.0
uses: peterjgrainger/action-create-branch@v3.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Draft new release

on:
workflow_dispatch
on: workflow_dispatch

jobs:
draft-new-release:
Expand All @@ -18,7 +17,7 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 16

# In order to make a commit, we need to initialize a user.
# You may choose to write something less generic here if you want, it doesn't matter functionality wise.
- name: Initialize mandatory git config
Expand All @@ -39,7 +38,7 @@ jobs:
git fetch --tags origin
git merge origin/master
current_version=$(jq -r .version package.json)

npx standard-version --skip.commit --skip.tag --skip.changelog
new_version=$(jq -r .version package.json)
git reset --hard
Expand All @@ -53,7 +52,7 @@ jobs:
echo "New release branch name is $branch_name"
git checkout -b "$branch_name"
git push --set-upstream origin "$branch_name"

echo "source_branch_name=$source_branch_name" >> $GITHUB_OUTPUT
echo "branch_name=$branch_name" >> $GITHUB_OUTPUT
echo "new_version=$new_version" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -84,8 +83,8 @@ jobs:
uses: repo-sync/pull-request@v2
with:
source_branch: ${{ steps.create-release.outputs.branch_name }}
destination_branch: 'master'
destination_branch: "master"
github_token: ${{ secrets.PAT }}
pr_title: "chore(release): pulling ${{ steps.create-release.outputs.branch_name }} into master"
pr_body: ":crown: *An automated PR*\n\n${{ steps.finish-release.outputs.commit_summary }}"
pr_reviewer: 'pallabmaiti'
pr_reviewer: "@rudderlabs/sdk-ios"
2 changes: 1 addition & 1 deletion .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
github_token: ${{ secrets.PAT }}
pr_title: "chore(release): pulling master into develop post release v${{ steps.extract-version.outputs.release_version }}"
pr_body: ":crown: *An automated PR*"
pr_reviewer: "pallabmaiti"
pr_reviewer: "@rudderlabs/sdk-ios"

- name: Delete hotfix release branch
uses: koj-co/delete-merged-action@master
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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.26.2](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.26.1...v1.26.2) (2024-04-08)


### Bug Fixes

* resolve issue with privacy manifest file not being generated when consumed through SPM ([#499](https://github.com/rudderlabs/rudder-sdk-ios/issues/499)) ([1d6761f](https://github.com/rudderlabs/rudder-sdk-ios/commit/1d6761f1d236caf141b6c1e7d7265d589f64664e))

### [1.26.1](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.26.0...v1.26.1) (2024-03-28)


Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ let package = Package(
path: "Sources",
sources: ["Classes/"],
resources: [
.copy("PrivacyInfo.xcprivacy")
.copy("Resources/PrivacyInfo.xcprivacy")
],
publicHeadersPath: "Classes/Headers/Public/",
cSettings: [
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.26.1&color=blue&style=flat">
<img src="https://img.shields.io/static/v1?label=pod&message=v1.26.2&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.26.1'
pod 'Rudder', '1.26.2'
```

### Carthage

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

```xcode
github "rudderlabs/rudder-sdk-ios" "v1.26.1"
github "rudderlabs/rudder-sdk-ios" "v1.26.2"
```

> 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.26.1` as the value, as shown:
* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.26.2` 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.26.1")
.package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.26.2")
],
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 @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.author = { "RudderStack" => "[email protected]" }
s.source = { :git => "https://github.com/rudderlabs/rudder-sdk-ios.git", :tag => "v#{s.version}" }

s.resource_bundles = { s.name => 'PrivacyInfo.xcprivacy' }
s.resource_bundles = { s.name => 'Sources/Resources/PrivacyInfo.xcprivacy' }


s.ios.deployment_target = '12.0'
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.26.1";
NSString *const SDK_VERSION = @"1.26.2";

#endif /* RSVersion_h */
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</array>
<key>NSPrivacyTrackingDomains</key>
<array>
<string>rudderstack.com</string>
<string>rudderstack.com/</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "1.26.1",
"version": "1.26.2",
"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.26.1
sonar.projectVersion=1.26.2

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