chore(release): pulling release/1.21.0 into master

rudderlabs · Sep 28, 2023 · bf3d215 · bf3d215
2 parents 9d18979 + f8ce0f7
commit bf3d215
Show file tree

Hide file tree

Showing 23 changed files with 246 additions and 142 deletions.
diff --git a/.github/workflows/build-and-quality-checks.yml b/.github/workflows/build-and-quality-checks.yml
@@ -5,8 +5,17 @@ on:
     types: ['opened', 'reopened', 'synchronize']
 
 jobs:
+  cancel_previous:
+    name: 'Cancel previous Code Quality Checks'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: styfle/[email protected]
+        with:
+          workflow_id: ${{ github.event.workflow.id }}
+
   build:
-    name: Code Quality Checks
+    name: 'Code Quality Checks'
+    needs: cancel_previous
     runs-on: macOS-latest
 
     steps:

diff --git a/.github/workflows/deploy-cocoapods-beta.yml → .github/workflows/deploy-beta-cocoapods.yml b/.github/workflows/deploy-cocoapods-beta.yml → .github/workflows/deploy-beta-cocoapods.yml
diff --git a/.github/workflows/deploy-cocoapods.yml b/.github/workflows/deploy-cocoapods.yml
@@ -1,13 +1,15 @@
 name: Deploy to Cocoapods
 
 on:
-  release:
-    types: [created]
+  workflow_run:
+    workflows: ['Publish new github release']
+    types: ['completed']
 
 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

diff --git a/.github/workflows/deploy-private-pod.yml b/.github/workflows/deploy-private-pod.yml
@@ -0,0 +1,30 @@
+name: Deploy to Private Pod
+
+on:
+  pull_request:
+    branches:
+      - master
+    types:
+      - opened
+
+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/'))
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: '${{ github.event.pull_request.head.ref }}'
+
+      - name: Install Cocoapods
+        run: gem install cocoapods
+
+      - name: Add Private Spec Repo to CocoaPods installation
+        run: |
+          pod repo add Rudder https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git
+        
+      - name: Add Podspec to repo
+        run: |
+          pod repo push Rudder Rudder.podspec
diff --git a/.github/workflows/draft-new-beta-release.yml b/.github/workflows/draft-new-beta-release.yml
@@ -81,3 +81,19 @@ jobs:
       - name: Push new version in release branch & tag
         run: |
           git push
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: '${{ steps.create-release.outputs.branch_name }}'
+
+      - name: Install Cocoapods
+        run: gem install cocoapods
+
+      - name: Add Private Spec Repo to CocoaPods installation
+        run: |
+          pod repo add Rudder https://${{secrets.PAT_USERNAME}}:${{secrets.PAT}}@github.com/rudderlabs/Specs.git
+
+      - name: Add Podspec to repo
+        run: |
+          pod repo push Rudder Rudder.podspec
diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml
@@ -74,11 +74,11 @@ jobs:
           git add README.md Sources/Classes/Headers/RSVersion.h sonar-project.properties
           echo ${{ steps.create-release.outputs.new_version }}
           echo "commit_summary=$SUMMARY" >> $GITHUB_OUTPUT
-          npx standard-version -a --skip.tag
+          npx standard-version -a
 
       - name: Push new version in release branch & tag
         run: |
-          git push
+          git push --follow-tags
 
       - name: Create pull request into master
         uses: repo-sync/pull-request@v2

diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -38,18 +38,13 @@ jobs:
           git config user.name "GitHub actions"
           git config user.email [email protected]
 
-      - name: Create Github Release & Tag
+      - name: Create Github Release
         id: create_release
         env:
           HUSKY: 0
           GITHUB_TOKEN: ${{ secrets.PAT }}
           CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.PAT }}
         run: |
-          git for-each-ref refs/tags
-          ./Scripts/find-tag.sh ${{ steps.extract-version.outputs.release_version }} && git tag --delete ${{ steps.extract-version.outputs.release_version }} && git push --delete origin ${{ steps.extract-version.outputs.release_version }}
-          git tag -a v${{ steps.extract-version.outputs.release_version }} -m "chore: release v${{ steps.extract-version.outputs.release_version }}"
-          git push origin refs/tags/v${{ steps.extract-version.outputs.release_version }}
-          git for-each-ref refs/tags
           DEBUG=conventional-github-releaser npx conventional-github-releaser -p angular --config github-release.config.js
 
       - name: Create pull request into develop
@@ -60,6 +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'
 
       - name: Delete hotfix release branch
         uses: koj-co/delete-merged-action@master

diff --git a/.github/workflows/slack-notify.yml b/.github/workflows/slack-notify.yml
@@ -1,13 +1,15 @@
 name: Notify Slack Channel
 
 on:
-  release:
-    types: [created]
+  workflow_run:
+    workflows: ['Deploy to Cocoapods']
+    types: ['completed']
 
 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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,8 +8,17 @@ on:
     types: ['opened', 'reopened', 'synchronize']
 
 jobs:
+  cancel_previous:
+    name: 'Cancel previous Tests & Coverage'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: styfle/[email protected]
+        with:
+          workflow_id: ${{ github.event.workflow.id }}
+
   build:
     name: 'Tests & Coverage'
+    needs: cancel_previous
     runs-on: macOS-latest
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed

diff --git a/CHANGELOG.md b/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.21.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.20.0...v1.21.0) (2023-09-28)
+
+
+### Features
+
+* improvements of SQLite RETURNING clause ([00e5032](https://github.com/rudderlabs/rudder-sdk-ios/commit/00e5032f68bde1fe171278c979a080a21a8efa12))
+
 ## [1.20.0](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.19.2...v1.20.0) (2023-09-19)
 
 

diff --git a/Examples/RudderSampleAppObjC/RudderSampleAppObjC/EncryptedDatabaseProvider.m b/Examples/RudderSampleAppObjC/RudderSampleAppObjC/EncryptedDatabaseProvider.m
@@ -53,6 +53,11 @@ - (int)key:(const void *)pKey nKey:(int)nKey {
     return sqlite3_key(db, pKey, nKey);
 }
 
+- (int)last_insert_rowid {
+    int64_t lastRowId = sqlite3_last_insert_rowid(db);
+    return (int)lastRowId;
+}
+
 @end
 
 @implementation EncryptedDatabaseProvider

diff --git a/Examples/RudderSampleAppSwift/RudderSampleAppSwift.xcodeproj/project.pbxproj b/Examples/RudderSampleAppSwift/RudderSampleAppSwift.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -396,13 +396,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = GTGKNDBD23;
+				DEVELOPMENT_TEAM = WPX9KRKA8B;
 				INFOPLIST_FILE = "$(SRCROOT)/RudderSampleAppSwift/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.rudderstack.ios.test.swift;
+				PRODUCT_BUNDLE_IDENTIFIER = com.rudderstack.ios.swift;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "RudderSampleAppSwift/RudderSampleAppSwift-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -417,13 +417,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = GTGKNDBD23;
+				DEVELOPMENT_TEAM = WPX9KRKA8B;
 				INFOPLIST_FILE = "$(SRCROOT)/RudderSampleAppSwift/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.rudderstack.ios.test.swift;
+				PRODUCT_BUNDLE_IDENTIFIER = com.rudderstack.ios.swift;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "RudderSampleAppSwift/RudderSampleAppSwift-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

diff --git a/Examples/RudderSampleAppSwift/RudderSampleAppSwift/EncryptedDatabaseProvider.swift b/Examples/RudderSampleAppSwift/RudderSampleAppSwift/EncryptedDatabaseProvider.swift
@@ -48,6 +48,10 @@ class EncryptedDatabase: RSDatabase {
     func key(_ pKey: UnsafeRawPointer?, nKey: Int32) -> Int32 {
         return sqlite3_key(db, pKey, nKey)
     }
+
+    func last_insert_rowid() -> Int32 {
+        return Int32(sqlite3_last_insert_rowid(db))
+    }
 }
 
 class EncryptedDatabaseProvider: RSDatabaseProvider {

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,10 +1,10 @@
 PODS:
-  - MetricsReporter (1.1.0):
-    - RSCrashReporter (~> 1.0.0)
-    - RudderKit (~> 1.4.0)
+  - MetricsReporter (1.1.1):
+    - RSCrashReporter (= 1.0.0)
+    - RudderKit (= 1.4.0)
   - RSCrashReporter (1.0.0)
-  - Rudder (1.19.2):
-    - MetricsReporter (= 1.1.0)
+  - Rudder (1.20.0):
+    - MetricsReporter (= 1.1.1)
   - RudderKit (1.4.0)
   - SQLCipher (4.5.4):
     - SQLCipher/standard (= 4.5.4)
@@ -31,12 +31,12 @@ EXTERNAL SOURCES:
     :path: "."
 
 SPEC CHECKSUMS:
-  MetricsReporter: d7f4da199ecceefb2e3a49a0b45b288fbadaca1f
+  MetricsReporter: d4265e0ac833e2c0078bbe044b3f9dbe29f53a48
   RSCrashReporter: 7e26b51ac816e967acb58fa458040946a93a9e65
-  Rudder: 0c2af547889deaddc88b800d0b04b4ade3fe6ce9
+  Rudder: d9e8730c891325da05ac4c454db09bc449d3b9ff
   RudderKit: d9d6997696e1642b753d8bdf94e57af643a68f03
   SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381
 
 PODFILE CHECKSUM: b6937cee06e0633464427ff0d975d40e17419e9f
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.13.0
diff --git a/README.md b/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.20.0&color=blue&style=flat">
+    <img src="https://img.shields.io/static/v1?label=pod&message=v1.21.0&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.20.0'
+pod 'Rudder', '1.21.0'
 ```
 
 ### Carthage
 
 For Carthage support, add the following line to your `Cartfile`:
 
 ```xcode
-github "rudderlabs/rudder-sdk-ios" "v1.20.0"
+github "rudderlabs/rudder-sdk-ios" "v1.21.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:
@@ -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.20.0` as the value, as shown:
+* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.21.0` 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.20.0")
+        .package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.21.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

diff --git a/Rudder.podspec b/Rudder.podspec
@@ -25,5 +25,5 @@ Pod::Spec.new do |s|
 
   s.source_files = 'Sources/**/*.{h,m}'
 
-  s.dependency 'MetricsReporter', '1.1.0'
+  s.dependency 'MetricsReporter', '1.1.1'
 end