chore(release): pulling release/1.25.1 into master

Merge pull request #466 from rudderlabs/release/1.25.1

.github/workflows/publish-new-release.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   release:
     name: Publish new release
-    runs-on: macOS-latest
+    runs-on: ubuntu-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)
@@ -47,28 +47,6 @@ jobs:
         run: |
           DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular --config github-release.config.js
 
-      - name: Install xcpretty
-        run: gem install xcpretty
-
-      - name: Install Cocoapods
-        run: gem install cocoapods
-
-      - name: Pod install
-        run: pod install --repo-update
-
-      - name: Generate XCFramework
-        run: |
-          sh ./scripts/generate-xcframework.sh
-
-      - name: Upload Release Artifact
-        run: |
-          zip -r Rudder-xcframeworks.zip xcframeworks
-          shasum -a 256 Rudder-xcframeworks.zip >Rudder-xcframeworks.sha256
-          gh release upload v${{ steps.extract-version.outputs.release_version }} Rudder-xcframeworks.zip
-          gh release upload v${{ steps.extract-version.outputs.release_version }} Rudder-xcframeworks.sha256
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Create pull request into develop
         uses: repo-sync/pull-request@v2
         with:
@@ -94,3 +72,43 @@ jobs:
           branches: "release/*"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  xcframework:
+    name: Generate and Upload XCFramework
+    runs-on: macos-latest
+    needs: release
+    steps:
+      - name: Extract version from branch name (for release branches)
+        id: extract-version
+        run: |
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          VERSION=${BRANCH_NAME#hotfix-}
+          VERSION=${VERSION#release/}
+          echo "release_version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Checkout source branch
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install xcpretty
+        run: gem install xcpretty
+
+      - name: Install Cocoapods
+        run: gem install cocoapods
+
+      - name: Pod install
+        run: pod install --repo-update
+
+      - name: Generate XCFramework
+        run: |
+          sh ./scripts/generate-xcframework.sh
+
+      - name: Upload Release Artifact
+        run: |
+          zip -r Rudder-xcframeworks.zip xcframeworks
+          shasum -a 256 Rudder-xcframeworks.zip >Rudder-xcframeworks.sha256
+          gh release upload v${{ steps.extract-version.outputs.release_version }} Rudder-xcframeworks.zip
+          gh release upload v${{ steps.extract-version.outputs.release_version }} Rudder-xcframeworks.sha256
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}

CHANGELOG.md

@@ -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.25.1](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.25.0...v1.25.1) (2024-02-07)
+
+
+### Bug Fixes
+
+* correct file name of LICENSE.md file in Podspec ([#465](https://github.com/rudderlabs/rudder-sdk-ios/issues/465)) ([c46edc6](https://github.com/rudderlabs/rudder-sdk-ios/commit/c46edc64ffb39a44bb5e6d4f37247a68c72d3d18))
+
 ## [1.25.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.24.2...v1.25.0) (2024-02-05)
 
 

Podfile.lock

@@ -3,7 +3,7 @@ PODS:
     - RSCrashReporter (= 1.0.1)
     - RudderKit (= 1.4.0)
   - RSCrashReporter (1.0.1)
-  - Rudder (1.24.1):
+  - Rudder (1.25.0):
     - MetricsReporter (= 1.2.1)
   - RudderKit (1.4.0)
   - SQLCipher (4.5.4):
@@ -33,10 +33,10 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   MetricsReporter: 99596ee5003c69949ed2f50acc34aee83c42f843
   RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
-  Rudder: c3fd4dca549852fd14153a928979fbced4b901a3
+  Rudder: 959b31df6a700432d3535b7d115afe0840d7b6c4
   RudderKit: d9d6997696e1642b753d8bdf94e57af643a68f03
   SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381
 
 PODFILE CHECKSUM: b6937cee06e0633464427ff0d975d40e17419e9f
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.14.3

README.md

@@ -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.25.0&color=blue&style=flat">
+    <img src="https://img.shields.io/static/v1?label=pod&message=v1.25.1&color=blue&style=flat">
     </a>
 </p>
 
@@ -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.25.0'
+pod 'Rudder', '1.25.1'
 ```
 
 ### Carthage
 
 For Carthage support, add the following line to your `Cartfile`:
 
 ```xcode
-github "rudderlabs/rudder-sdk-ios" "v1.25.0"
+github "rudderlabs/rudder-sdk-ios" "v1.25.1"
 ```
 
 > 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:
@@ -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.25.0` as the value, as shown:
+* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.25.1` as the value, as shown:
 
 ![Setting dependency](https://user-images.githubusercontent.com/59817155/145574696-8c849749-13e0-40d5-aacb-3fccb5c8e67d.png)
 
@@ -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.25.0")
+        .package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.25.1")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Rudder.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
                        DESC
 
   s.homepage         = "https://github.com/rudderlabs/rudder-sdk-ios"
-  s.license          = { :type => "Apache", :file => "LICENSE" }
+  s.license          = { :type => "Apache", :file => "LICENSE.md" }
   s.author           = { "RudderStack" => "[email protected]" }
   s.source           = { :git => "https://github.com/rudderlabs/rudder-sdk-ios.git", :tag => "v#{s.version}" }
 

Sources/Classes/Headers/RSVersion.h

@@ -8,6 +8,6 @@
 #ifndef RSVersion_h
 #define RSVersion_h
 
-NSString *const SDK_VERSION = @"1.25.0";
+NSString *const SDK_VERSION = @"1.25.1";
 
 #endif /* RSVersion_h */

package.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.25.0",
+    "version": "1.25.1",
     "description": "Rudder is a platform for collecting, storing and routing customer event data to dozens of tools"
 }

sonar-project.properties

@@ -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.25.0
+sonar.projectVersion=1.25.1
 
 # C/C++/Objective-C related details
 # sonar.cfamily.compile-commands=compile_commands.json