chore(release): pulling release-v2/2.4.0 into master-v2

rudderlabs · Oct 17, 2023 · aba7771 · aba7771
2 parents edbf4bf + a87a8ff
commit aba7771
Show file tree

Hide file tree

Showing 35 changed files with 3,404 additions and 14,611 deletions.
diff --git a/.github/workflows/create_hotfix_branch-v2.yml b/.github/workflows/create_hotfix_branch-v2.yml
@@ -23,4 +23,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           with:
-            branch: '${{ BRANCH_NAME }}/${{ github.event.inputs.hotfix_name }}-v2'
+            branch: '${{ BRANCH_NAME }}/${{ github.event.inputs.hotfix_name }}'
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.15.1
+18.17.1
diff --git a/android/project.json b/android/project.json
@@ -6,17 +6,23 @@
   "targets": {
     "build": {
       "executor": "@jnxplus/nx-gradle:build",
-      "outputs": ["./android/build"]
+      "outputs": [
+        "{projectRoot}/android/build"
+      ]
     },
     "lint": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:lint",
       "options": {
         "linter": "ktlint"
       }
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:test"
     },
     "ktformat": {
@@ -44,14 +50,18 @@
       }
     },
     "release-sonatype": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'android-release' && ./gradlew :android:publishToSonatype -Prelease closeAndReleaseSonatypeStagingRepository"
       }
     },
     "snapshot-release": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'android-snapshot' && ./gradlew :android:publishToSonatype"

diff --git a/core/project.json b/core/project.json
@@ -6,17 +6,23 @@
   "targets": {
     "build": {
       "executor": "@jnxplus/nx-gradle:build",
-      "outputs": ["./core/build"]
+      "outputs": [
+        "{projectRoot}/core/build"
+      ]
     },
     "lint": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:lint",
       "options": {
         "linter": "ktlint"
       }
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:test"
     },
     "ktformat": {
@@ -44,14 +50,18 @@
       }
     },
     "release-sonatype": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'core-release' && ./gradlew :core:publishToSonatype -Prelease closeAndReleaseSonatypeStagingRepository"
       }
     },
     "snapshot-release": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'core-snapshot' && ./gradlew :core:publishToSonatype"

diff --git a/gradle-updater.js b/gradle-updater.js
@@ -7,6 +7,10 @@ const version = packageJson.version;
 const contents = fs.readFileSync(`${package}/gradle.properties`, 'utf8');
 const properties = PropertiesReader();
 properties.read(contents);
+let oldVersion = properties.get("VERSION_NAME");
+if (oldVersion === version) {
+  return;
+}
 let versionCode = properties.get("VERSION_CODE");
 properties.set("VERSION_NAME", version);
 properties.set("VERSION_CODE", (versionCode + 1));

diff --git a/gsonrudderadapter/CHANGELOG_LATEST.md b/gsonrudderadapter/CHANGELOG_LATEST.md
@@ -1,6 +1,7 @@
-## 0.2.0 (2023-08-01)
+## 0.2.0 (2023-09-19)
 
 
 ### Features
 
+* error stats library implementation  ([#307](https://github.com/rudderlabs/rudder-sdk-android/issues/307)) ([abc5a41](https://github.com/rudderlabs/rudder-sdk-android/commit/abc5a410affda77d99b731e645d38e18e6d05037)), closes [#271](https://github.com/rudderlabs/rudder-sdk-android/issues/271)
 * metrics v2 ([#256](https://github.com/rudderlabs/rudder-sdk-android/issues/256)) ([c0b9639](https://github.com/rudderlabs/rudder-sdk-android/commit/c0b96397a14c5ff5baa3900804fd3b5b02d21304))
diff --git a/gsonrudderadapter/package-lock.json b/gsonrudderadapter/package-lock.json
diff --git a/gsonrudderadapter/project.json b/gsonrudderadapter/project.json
@@ -7,23 +7,30 @@
     "build": {
       "dependsOn": [
         {
-          "projects":[
-            "rudderjsonadapter"],
-          "target":"build"
+          "projects": [
+            "rudderjsonadapter"
+          ],
+          "target": "build"
         }
       ],
       "executor": "@jnxplus/nx-gradle:build",
-      "outputs": ["./gsonrudderadapter/build"]
+      "outputs": [
+        "{projectRoot}/gsonrudderadapter/build"
+      ]
     },
     "lint": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:lint",
       "options": {
         "linter": "ktlint"
       }
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:test"
     },
     "ktformat": {
@@ -46,19 +53,24 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
+        "title": "[email protected]",
         "tag": "[email protected]",
         "notesFile": "./gsonrudderadapter/CHANGELOG_LATEST.md"
       }
     },
     "release-sonatype": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'gsonrudderadapter-release' && ./gradlew publishToSonatype -p gsonrudderadapter -Prelease  && ./gradlew findSonatypeStagingRepository closeSonatypeStagingRepository && ./gradlew findSonatypeStagingRepository releaseSonatypeStagingRepository"
       }
     },
     "snapshot-release": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'gsonrudderadapter-snapshot' && cd gsonrudderadapter && sh ../gradlew generatePomFileForReleasePublication && sh ../gradlew publishToSonatype && cd .."

diff --git a/jacksonrudderadapter/CHANGELOG_LATEST.md b/jacksonrudderadapter/CHANGELOG_LATEST.md
@@ -1,6 +1,12 @@
-## 0.1.0 (2023-08-01)
+## 0.2.0 (2023-09-19)
 
 
 ### Features
 
+* error stats library implementation  ([#307](https://github.com/rudderlabs/rudder-sdk-android/issues/307)) ([abc5a41](https://github.com/rudderlabs/rudder-sdk-android/commit/abc5a410affda77d99b731e645d38e18e6d05037)), closes [#271](https://github.com/rudderlabs/rudder-sdk-android/issues/271)
 * metrics v2 ([#256](https://github.com/rudderlabs/rudder-sdk-android/issues/256)) ([c0b9639](https://github.com/rudderlabs/rudder-sdk-android/commit/c0b96397a14c5ff5baa3900804fd3b5b02d21304))
+
+
+### Bug Fixes
+
+* manual release + last minute fixes ([#275](https://github.com/rudderlabs/rudder-sdk-android/issues/275)) ([a52e9f7](https://github.com/rudderlabs/rudder-sdk-android/commit/a52e9f7567eb494a83ed6f57f6bd36017afaf39b)), closes [#256](https://github.com/rudderlabs/rudder-sdk-android/issues/256)
diff --git a/jacksonrudderadapter/package-lock.json b/jacksonrudderadapter/package-lock.json
diff --git a/jacksonrudderadapter/project.json b/jacksonrudderadapter/project.json
@@ -7,24 +7,30 @@
     "build": {
       "dependsOn": [
         {
-          "projects":[
+          "projects": [
             "rudderjsonadapter"
           ],
-          "target":"build"
+          "target": "build"
         }
       ],
       "executor": "@jnxplus/nx-gradle:build",
-      "outputs": ["./jacksonrudderadapter/build"]
+      "outputs": [
+        "{projectRoot}/jacksonrudderadapter/build"
+      ]
     },
     "lint": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:lint",
       "options": {
         "linter": "ktlint"
       }
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:test"
     },
     "ktformat": {
@@ -47,19 +53,24 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
+        "title": "[email protected]",
         "tag": "[email protected]",
         "notesFile": "./jacksonrudderadapter/CHANGELOG_LATEST.md"
       }
     },
     "release-sonatype": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'jacksonrudderadapter-release' && ./gradlew publishToSonatype -p jacksonrudderadapter -Prelease && ./gradlew findSonatypeStagingRepository closeSonatypeStagingRepository && ./gradlew findSonatypeStagingRepository releaseSonatypeStagingRepository"
       }
     },
     "snapshot-release": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'jacksonrudderadapter-snapshot' && cd jacksonrudderadapter && sh ../gradlew generatePomFileForReleasePublication && ../gradlew publishToSonatype && cd .."

diff --git a/models/CHANGELOG_LATEST.md b/models/CHANGELOG_LATEST.md
@@ -1,6 +1,7 @@
-## 0.1.0 (2023-08-01)
+## 0.1.0 (2023-09-19)
 
 
 ### Features
 
 * metrics v2 ([#256](https://github.com/rudderlabs/rudder-sdk-android/issues/256)) ([c0b9639](https://github.com/rudderlabs/rudder-sdk-android/commit/c0b96397a14c5ff5baa3900804fd3b5b02d21304))
+
diff --git a/models/package-lock.json b/models/package-lock.json
diff --git a/models/project.json b/models/project.json
@@ -6,17 +6,23 @@
   "targets": {
     "build": {
       "executor": "@jnxplus/nx-gradle:build",
-      "outputs": ["./models/build"]
+      "outputs": [
+        "{projectRoot}/models/build"
+      ]
     },
     "lint": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:lint",
       "options": {
         "linter": "ktlint"
       }
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:test"
     },
     "ktformat": {
@@ -39,19 +45,24 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
+        "title": "[email protected]",
         "tag": "[email protected]",
         "notesFile": "./models/CHANGELOG_LATEST.md"
       }
     },
     "release-sonatype": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'models-release' && cd models && sh ../gradlew generatePomFileForReleasePublication && ../gradlew publishToSonatype  && cd ..  && ./gradlew findSonatypeStagingRepository closeSonatypeStagingRepository && ./gradlew findSonatypeStagingRepository releaseSonatypeStagingRepository"
       }
     },
     "snapshot-release": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'models-snapshot' && cd models && sh ../gradlew generatePomFileForReleasePublication && ../gradlew publishToSonatype && cd .."

diff --git a/moshirudderadapter/CHANGELOG_LATEST.md b/moshirudderadapter/CHANGELOG_LATEST.md
@@ -1,6 +1,13 @@
-## 0.1.0 (2023-08-01)
+## 0.1.0 (2023-09-19)
 
 
 ### Features
 
+* error stats library implementation  ([#307](https://github.com/rudderlabs/rudder-sdk-android/issues/307)) ([abc5a41](https://github.com/rudderlabs/rudder-sdk-android/commit/abc5a410affda77d99b731e645d38e18e6d05037)), closes [#271](https://github.com/rudderlabs/rudder-sdk-android/issues/271)
 * metrics v2 ([#256](https://github.com/rudderlabs/rudder-sdk-android/issues/256)) ([c0b9639](https://github.com/rudderlabs/rudder-sdk-android/commit/c0b96397a14c5ff5baa3900804fd3b5b02d21304))
+
+
+### Bug Fixes
+
+* manual release + last minute fixes ([#275](https://github.com/rudderlabs/rudder-sdk-android/issues/275)) ([a52e9f7](https://github.com/rudderlabs/rudder-sdk-android/commit/a52e9f7567eb494a83ed6f57f6bd36017afaf39b)), closes [#256](https://github.com/rudderlabs/rudder-sdk-android/issues/256)
+