From d0b76369d2e4d6fd7488c3be4fa368d4387f5365 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Mon, 20 Jul 2026 17:18:15 +0530
Subject: [PATCH 1/2] feat: add ignorelist for bcprov-jdk18on in
 gradle.properties to resolve Jetifier parsing issues

---
 gradle.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index e3822e8b..27c17344 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,8 @@
 android.useAndroidX=true
 android.enableJetifier=true
+# bcprov-jdk18on 1.85 is a multi-release jar with Java 25 class files (major version 69);
+# Jetifier's ASM reader can't parse it, and it has no support-library references to jetify anyway.
+android.jetifier.ignorelist=bcprov-jdk18on
 android.enableR8.fullMode=false
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 android.suppressUnsupportedCompileSdk=34

From 0a84b924d628549c7df4cf57df5ce19af0f7eab8 Mon Sep 17 00:00:00 2001
From: Aravind Kumar <aravind.kumar@contentstack.com>
Date: Sun, 2 Aug 2026 17:46:04 +0530
Subject: [PATCH 2/2] sca-scan.yml

---
 .github/workflows/sca-scan.yml | 43 +++++++---------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml
index 362bea27..ea29c143 100644
--- a/.github/workflows/sca-scan.yml
+++ b/.github/workflows/sca-scan.yml
@@ -5,42 +5,17 @@ on:
 jobs:
   security-sca:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
       - uses: actions/checkout@master
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'gradle'
-
-      - name: Set up Android SDK
-        uses: android-actions/setup-android@v3
-        with:
-          packages: 'tools platform-tools platforms;android-34 build-tools;34.0.0'
-
-      - name: Setup local.properties
-        run: |
-           cat << EOF >> local.properties
-           sdk.dir=$ANDROID_HOME
-           host="${{ secrets.HOST }}"
-           APIKey="${{ secrets.API_KEY }}"
-           deliveryToken="${{ secrets.DELIVERY_TOKEN }}"
-           environment="${{ secrets.ENVIRONMENT }}"
-           contentType="${{ secrets.CONTENT_TYPE }}"
-           assetUid="${{ secrets.ASSET_UID }}"
-           EOF
-
-      - name: Set up Snyk
-        uses: snyk/actions/setup@master
-        with:
-          snyk-version: latest
-
-      - name: Run Snyk
+      - name: Run Snyk to check for vulnerabilities
+        uses: snyk/actions/gradle@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        run: snyk test --fail-on=all --all-sub-projects --json > snyk.json
+        with:
+          args: --fail-on=all --all-sub-projects
+          json: true
         continue-on-error: true
-
-      - uses: contentstack/sca-policy@main
+      - uses: contentstack/sca-policy@main
\ No newline at end of file