From c239454b6f2c8566dff5ebe42a6377f1a37224f9 Mon Sep 17 00:00:00 2001
From: Debanjan Chatterjee <debanjanchatterjee99@gmail.com>
Date: Wed, 23 Aug 2023 15:57:13 +0530
Subject: [PATCH 1/2] fix: github actions

---
 .github/workflows/build-v2.yml                     |  7 ++++---
 .../workflows/publish-new-github-release-v2.yml    |  2 +-
 .github/workflows/release-v2.yml                   | 14 +++++++++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-v2.yml b/.github/workflows/build-v2.yml
index eb9620228..2d0a92ba2 100644
--- a/.github/workflows/build-v2.yml
+++ b/.github/workflows/build-v2.yml
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  cancel_previous:
+  cancel_previous-v2:
 
     runs-on: ubuntu-latest
     steps:
@@ -17,7 +17,7 @@ jobs:
         with:
           workflow_id: ${{ github.event.workflow.id }}
 
-  build:
+  build-v2:
     needs: cancel_previous
     name: Build & Code Quality Checks
     runs-on: ubuntu-latest
@@ -38,7 +38,8 @@ jobs:
       - name: Set Node 16
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: '.nvmrc'
+          cache: 'npm'
 
       - name: Install node_modules
         run: |
diff --git a/.github/workflows/publish-new-github-release-v2.yml b/.github/workflows/publish-new-github-release-v2.yml
index 6c655ed98..03672322c 100644
--- a/.github/workflows/publish-new-github-release-v2.yml
+++ b/.github/workflows/publish-new-github-release-v2.yml
@@ -9,7 +9,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 jobs:
-  release:
+  release-v2:
     name: Publish new release for v2
     runs-on: ubuntu-latest
     if: (startsWith(github.event.pull_request.head.ref, 'release-v2/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release-v2/')) && github.event.pull_request.merged == true # only merged pull requests must trigger this job
diff --git a/.github/workflows/release-v2.yml b/.github/workflows/release-v2.yml
index 6ecaaf03b..16785da50 100644
--- a/.github/workflows/release-v2.yml
+++ b/.github/workflows/release-v2.yml
@@ -46,10 +46,22 @@ jobs:
         run: |
           npm ci
 
+      - name: Get the two latest versions
+        run: |
+          CURRENT_VERSION=$(git tag -l "v*" --sort=-version:refname | head -n 1)
+          LAST_VERSION=$(git tag -l "v*" --sort=-version:refname | head -n 2 | awk 'NR == 2 { print $1 }')
+          
+          echo "Current version: $CURRENT_VERSION"
+          echo "Previous version: $LAST_VERSION"
+          
+          echo "current_version=$(echo $CURRENT_VERSION)" >> $GITHUB_ENV
+          echo "last_version=$(echo $LAST_VERSION)" >> $GITHUB_ENV
+          echo "DATE=$(date)" >> $GITHUB_ENV
       - name: Publish release to sonatype
         run: |
           git fetch --no-tags --prune --depth=100 origin master-v2
-          npm run release:sonatype
+          npm run release:sonatype -- --base=$last_version --head=$current_version
+
         env:
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}

From 8f84d5a5aaef2686b777a7d725a85e780fa2305e Mon Sep 17 00:00:00 2001
From: GitHub actions <noreply@github.com>
Date: Mon, 4 Sep 2023 14:56:57 +0000
Subject: [PATCH 2/2] chore(release): 1.18.1

---
 CHANGELOG.md      | 10 ++++++++++
 gradle.properties |  4 ++--
 package.json      |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e86240a4..4fa7df56a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 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.18.1](https://github.com/rudderlabs/rudder-sdk-android/compare/v1.18.0...v1.18.1) (2023-09-04)
+
+
+### Bug Fixes
+
+* ci actions in draft_new_release ([195c162](https://github.com/rudderlabs/rudder-sdk-android/commit/195c162171a53fc7e95d01d5ded28e85b1b15697))
+* remove depth from draft new release ([d851b62](https://github.com/rudderlabs/rudder-sdk-android/commit/d851b627ec5a2089a3b64b5680ad3012c36b98fe))
+* sdk 197 metrics initialization fix ([#294](https://github.com/rudderlabs/rudder-sdk-android/issues/294)) ([82fd548](https://github.com/rudderlabs/rudder-sdk-android/commit/82fd5481e7781be0c589d9780afa058bb089b8fd))
+* sdk 400 ensure empty key is not accepted as encryption key for ([#293](https://github.com/rudderlabs/rudder-sdk-android/issues/293)) ([a7176b1](https://github.com/rudderlabs/rudder-sdk-android/commit/a7176b1bb6ca2e9d626c440fb6dad20e626eeef8))
+
 ## [1.18.0](https://github.com/rudderlabs/rudder-sdk-android/compare/v1.16.0...v1.18.0) (2023-08-28)
 
 
diff --git a/gradle.properties b/gradle.properties
index 30768348a..b4eb7c7fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 GROUP=com.rudderstack.android.sdk
-VERSION_CODE=15
-VERSION_NAME=1.18.0
+VERSION_CODE=16
+VERSION_NAME=1.18.1
 POM_NAME=Rudderstack SDK for android
 POM_DESCRIPTION=Rudderstack SDK for android
 POM_ARTIFACT_ID=core
diff --git a/package.json b/package.json
index d9cdfae88..fec514e14 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.18.0",
+  "version": "1.18.1",
   "dependencies": {
     "properties-reader": "^2.2.0"
   }