Merge branch 'master' into feat/DX-517

.github/workflows/jira.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened]
 jobs:
-  security:
+  security-jira:
     if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'snyk-bot' || contains(github.event.pull_request.head.ref, 'snyk-fix-')  || contains(github.event.pull_request.head.ref, 'snyk-upgrade-')}}
     runs-on: ubuntu-latest
     steps:
@@ -26,3 +26,8 @@ jobs:
             PR: ${{ github.event.pull_request.html_url }}
 
           fields: "${{ secrets.JIRA_FIELDS }}"
+      - name: Transition issue
+        uses: atlassian/gajira-transition@v3
+        with:
+          issue: ${{ steps.create.outputs.issue }}
+          transition: ${{ secrets.JIRA_TRANSITION }}

.github/workflows/sast-scan.yml

@@ -0,0 +1,11 @@
+name: SAST Scan
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  security-sast:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Semgrep Scan
+        run: docker run -v /var/run/docker.sock:/var/run/docker.sock -v "${PWD}:/src" returntocorp/semgrep semgrep scan --config auto

.github/workflows/sca-scan.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
-  security:
+  security-sca:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -19,6 +19,6 @@ jobs:
           assetUid="${{ secrets.ASSET_UID }}"
           EOF
       - uses: snyk/actions/setup@master
-      - run: snyk test
+      - run: snyk test --fail-on=all
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.gitignore

@@ -26,8 +26,8 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
-gradle.properties
-/gradle.properties
+# gradle.properties
+# /gradle.properties
 
 
 # Proguard folder generated by Eclipse

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## Version 3.15.0
+
+### Date: 20-May-2024
+
+- Fixes and enhancements
+
+---
+
 ## Version 3.14.0
 
 ### Date: 13-May-2024

contentstack/build.gradle

@@ -151,6 +151,9 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+
+//    implementation 'com.squareup.okio:okio:3.9.0'
+    implementation 'com.github.rjeschke:txtmark:0.12'
 }
 tasks.register('clearJar', Delete) { delete 'build/libs/contentstack.jar' }
 tasks.register('unzip', Copy) {
@@ -165,4 +168,4 @@ tasks.register('createJar', Jar) {
     include 'com/contentstack/'
     //include 'META-INF/'
 }
-createJar.dependsOn(clearJar, unzip, build)
+createJar.dependsOn(clearJar, unzip, build)