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.25.0 into master #459

Closed
wants to merge 11 commits into from
Closed
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/build-and-quality-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: 'Cancel previous Code Quality Checks'
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.11.0
- uses: styfle/cancel-workflow-action@0.12.1
with:
workflow_id: ${{ github.event.workflow.id }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/draft-new-beta-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ on:
jobs:
draft-new-beta-release:
name: Draft a new Beta release
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/heads/fix/') || startsWith(github.ref, 'refs/heads/feat/')
runs-on: macOS-latest
if: startsWith(github.ref, 'refs/heads/fix/') || startsWith(github.ref, 'refs/heads/feat/') || startsWith(github.ref, 'refs/heads/feature/')
steps:
- name: Checkout source branch
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set Node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0

- name: Set Node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0

- name: Set Node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-new-release-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: Set Node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
release:
name: Publish new release
runs-on: ubuntu-latest
runs-on: macOS-latest
if: (startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true # only merged pull requests must trigger this job
steps:
- name: Extract version from branch name (for release branches)
Expand All @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: Set Node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: 'Cancel previous Tests & Coverage'
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.11.0
- uses: styfle/cancel-workflow-action@0.12.1
with:
workflow_id: ${{ github.event.workflow.id }}

Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

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.25.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.24.2...v1.25.0) (2024-02-05)


### Features

* add privacy manifest file to ios sdk ([#453](https://github.com/rudderlabs/rudder-sdk-ios/issues/453)) ([0b1b207](https://github.com/rudderlabs/rudder-sdk-ios/commit/0b1b2077ffc00bdfa34082e1d4b5ac1b48569b15))


### Bug Fixes

* handling the serialization of special floating point values while serializing any object ([#447](https://github.com/rudderlabs/rudder-sdk-ios/issues/447)) ([50d06a6](https://github.com/rudderlabs/rudder-sdk-ios/commit/50d06a68742c7da0160b398801616dda2662cc3b))
* sending detailed device model info ([#448](https://github.com/rudderlabs/rudder-sdk-ios/issues/448)) ([ec8e9d3](https://github.com/rudderlabs/rudder-sdk-ios/commit/ec8e9d3c6911c010cbd68130a92ef895d4bde183))

### [1.24.2](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.24.1...v1.24.2) (2024-01-03)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
601AB269529B9CADA5EC9AC8 /* Pods_RudderSampleApptvOSObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38BCBDFF738EC338B5CA07E0 /* Pods_RudderSampleApptvOSObjC.framework */; };
ED0CA6E72A7D058100899C1C /* RudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = ED0CA6E42A7D058100899C1C /* RudderConfig.plist */; };
ED0CA6E82A7D058100899C1C /* SampleRudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = ED0CA6E52A7D058100899C1C /* SampleRudderConfig.plist */; };
ED0CA6E92A7D058100899C1C /* RudderConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0CA6E62A7D058100899C1C /* RudderConfig.swift */; };
F636324327291C0D0086D05A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F636324227291C0D0086D05A /* AppDelegate.m */; };
Expand All @@ -17,6 +16,7 @@
F636324B27291C0F0086D05A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F636324A27291C0F0086D05A /* Assets.xcassets */; };
F636324E27291C0F0086D05A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F636324C27291C0F0086D05A /* LaunchScreen.storyboard */; };
F636325027291C0F0086D05A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F636324F27291C0F0086D05A /* main.m */; };
F641160A2B6C2E170015CB42 /* RudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = F64116092B6C2E170015CB42 /* RudderConfig.plist */; };
F6FDD63F27296E910024E78F /* CustomIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FDD63B27296E910024E78F /* CustomIntegration.m */; };
F6FDD64027296E910024E78F /* CustomFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FDD63C27296E910024E78F /* CustomFactory.m */; };
/* End PBXBuildFile section */
Expand All @@ -26,7 +26,6 @@
3B292BF359E4526CC983C4B1 /* Pods-RudderSampleApptvOSObjC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RudderSampleApptvOSObjC.debug.xcconfig"; path = "Target Support Files/Pods-RudderSampleApptvOSObjC/Pods-RudderSampleApptvOSObjC.debug.xcconfig"; sourceTree = "<group>"; };
D3066D19C139C74D40518844 /* Pods-RudderSampleApptvOSObjC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RudderSampleApptvOSObjC.release.xcconfig"; path = "Target Support Files/Pods-RudderSampleApptvOSObjC/Pods-RudderSampleApptvOSObjC.release.xcconfig"; sourceTree = "<group>"; };
ED0CA6E02A7D057800899C1C /* RudderSampleApptvOSObjC-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RudderSampleApptvOSObjC-Bridging-Header.h"; sourceTree = "<group>"; };
ED0CA6E42A7D058100899C1C /* RudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RudderConfig.plist; sourceTree = "<group>"; };
ED0CA6E52A7D058100899C1C /* SampleRudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SampleRudderConfig.plist; sourceTree = "<group>"; };
ED0CA6E62A7D058100899C1C /* RudderConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RudderConfig.swift; sourceTree = "<group>"; };
F636323E27291C0D0086D05A /* RudderSampleApptvOSObjC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RudderSampleApptvOSObjC.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -41,6 +40,7 @@
F636325727291C640086D05A /* Rudder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Rudder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F636325B27291D4A0086D05A /* Rudder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Rudder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F636325F27291EBC0086D05A /* Rudder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Rudder.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F64116092B6C2E170015CB42 /* RudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RudderConfig.plist; sourceTree = "<group>"; };
F6FDD63B27296E910024E78F /* CustomIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomIntegration.m; sourceTree = "<group>"; };
F6FDD63C27296E910024E78F /* CustomFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomFactory.m; sourceTree = "<group>"; };
F6FDD63D27296E910024E78F /* CustomIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomIntegration.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -72,7 +72,6 @@
ED0CA6E32A7D058100899C1C /* RudderConfig */ = {
isa = PBXGroup;
children = (
ED0CA6E42A7D058100899C1C /* RudderConfig.plist */,
ED0CA6E52A7D058100899C1C /* SampleRudderConfig.plist */,
ED0CA6E62A7D058100899C1C /* RudderConfig.swift */,
);
Expand Down Expand Up @@ -101,6 +100,7 @@
F636324027291C0D0086D05A /* RudderSampleApptvOSObjC */ = {
isa = PBXGroup;
children = (
F64116092B6C2E170015CB42 /* RudderConfig.plist */,
ED0CA6E32A7D058100899C1C /* RudderConfig */,
F636324127291C0D0086D05A /* AppDelegate.h */,
F636324227291C0D0086D05A /* AppDelegate.m */,
Expand Down Expand Up @@ -190,8 +190,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
ED0CA6E72A7D058100899C1C /* RudderConfig.plist in Resources */,
F636324E27291C0F0086D05A /* LaunchScreen.storyboard in Resources */,
F641160A2B6C2E170015CB42 /* RudderConfig.plist in Resources */,
ED0CA6E82A7D058100899C1C /* SampleRudderConfig.plist in Resources */,
F636324B27291C0F0086D05A /* Assets.xcassets in Resources */,
F636324927291C0D0086D05A /* Main.storyboard in Resources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
9FE3D0956553F6943CE0B97E /* Pods_RudderSampleAppwatchOSObjC_WatchKit_Extension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 868D4D5936FB0FE3FC86FD07 /* Pods_RudderSampleAppwatchOSObjC_WatchKit_Extension.framework */; };
ED0CA6FD2A7D0A3300899C1C /* RudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = ED0CA6FA2A7D0A3300899C1C /* RudderConfig.plist */; };
ED0CA6FE2A7D0A3300899C1C /* SampleRudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = ED0CA6FB2A7D0A3300899C1C /* SampleRudderConfig.plist */; };
ED0CA6FF2A7D0A3300899C1C /* RudderConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0CA6FC2A7D0A3300899C1C /* RudderConfig.swift */; };
F6F43B902757417F0036CC12 /* RudderSampleAppwatchOSObjC WatchKit App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = F6F43B8F2757417F0036CC12 /* RudderSampleAppwatchOSObjC WatchKit App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -69,7 +68,6 @@
B2D78A99EAE3F5AD5397B003 /* Pods-RudderSampleAppwatchOSObjC WatchKit Extension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RudderSampleAppwatchOSObjC WatchKit Extension.release.xcconfig"; path = "Target Support Files/Pods-RudderSampleAppwatchOSObjC WatchKit Extension/Pods-RudderSampleAppwatchOSObjC WatchKit Extension.release.xcconfig"; sourceTree = "<group>"; };
EBDE6B2F2AB87F17F98D5D23 /* Pods-RudderSampleAppwatchOSObjC WatchKit Extension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RudderSampleAppwatchOSObjC WatchKit Extension.debug.xcconfig"; path = "Target Support Files/Pods-RudderSampleAppwatchOSObjC WatchKit Extension/Pods-RudderSampleAppwatchOSObjC WatchKit Extension.debug.xcconfig"; sourceTree = "<group>"; };
ED0CA6F62A7D0A2600899C1C /* RudderSampleAppwatchOSObjC WatchKit Extension-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RudderSampleAppwatchOSObjC WatchKit Extension-Bridging-Header.h"; sourceTree = "<group>"; };
ED0CA6FA2A7D0A3300899C1C /* RudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RudderConfig.plist; sourceTree = "<group>"; };
ED0CA6FB2A7D0A3300899C1C /* SampleRudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SampleRudderConfig.plist; sourceTree = "<group>"; };
ED0CA6FC2A7D0A3300899C1C /* RudderConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RudderConfig.swift; sourceTree = "<group>"; };
F6F43B8B2757417E0036CC12 /* RudderSampleAppwatchOSObjC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RudderSampleAppwatchOSObjC.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -137,7 +135,6 @@
ED0CA6F92A7D0A3300899C1C /* RudderConfig */ = {
isa = PBXGroup;
children = (
ED0CA6FA2A7D0A3300899C1C /* RudderConfig.plist */,
ED0CA6FB2A7D0A3300899C1C /* SampleRudderConfig.plist */,
ED0CA6FC2A7D0A3300899C1C /* RudderConfig.swift */,
);
Expand Down Expand Up @@ -315,7 +312,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
ED0CA6FD2A7D0A3300899C1C /* RudderConfig.plist in Resources */,
F6F43BAF275741820036CC12 /* Assets.xcassets in Resources */,
ED0CA6FE2A7D0A3300899C1C /* SampleRudderConfig.plist in Resources */,
);
Expand Down
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

44 changes: 44 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
### Elastic License 2.0 (ELv2) ###

## Acceptance ##
By using the software, you agree to all of the terms and conditions below.

## Copyright License ##
The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below

## Limitations ##
You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.

You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.

You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.

## Patents ##
The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.

## Notices ##
You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.

If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.

## No Other Rights ##
These terms do not imply any licenses other than those expressly granted in these terms.

## Termination ##
If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.

## No Liability ##
As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.

## Definitions ##
The *licensor* is the entity offering these terms, and the *software* is the software the licensor makes available under these terms, including any portion of it.

*you* refers to the individual or entity agreeing to these terms.

*your company* is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. *control* means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.

*your licenses* are all the licenses granted to you for the software under these terms.

*use* means anything you do with the software requiring one of your licenses.

*trademark* means trademarks, service marks, and similar rights.
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/rudderlabs/crash-reporter-ios",
"state": {
"branch": null,
"revision": "5b7cf9025d126c4a0b363a8ba6eb1aebd11137ec",
"version": "1.0.0"
"revision": "ee563535b64d9d5feacd0fa243663b2658033a19",
"version": "1.0.1"
}
},
{
"package": "MetricsReporter",
"repositoryURL": "https://github.com/rudderlabs/metrics-reporter-ios",
"state": {
"branch": null,
"revision": "c0cf7734cf7befcab0cf8a9f5569ec6da1c4c35c",
"version": "1.1.0"
"revision": "c5fe7cc861a83ec75978a516c02398c2a2cb1f20",
"version": "1.2.1"
}
},
{
Expand Down
5 changes: 4 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.2
// swift-tools-version:5.3

import PackageDescription

Expand All @@ -24,6 +24,9 @@ let package = Package(
],
path: "Sources",
sources: ["Classes/"],
resources: [
.copy("PrivacyInfo.xcprivacy")
],
publicHeadersPath: "Classes/Headers/Public/",
cSettings: [
.headerSearchPath("Classes/Headers/")
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
MetricsReporter: 99596ee5003c69949ed2f50acc34aee83c42f843
RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
Rudder: 8091e861028a12add1107b03d224d4abf08c597f
Rudder: c3fd4dca549852fd14153a928979fbced4b901a3
RudderKit: d9d6997696e1642b753d8bdf94e57af643a68f03
SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381

Expand Down
Loading
Loading