Merge pull request #54 from contentstack/fix/DX-87-removing-okio-txtm…

…ark-folder Fix/dx 87 removing okio txtmark folder
contentstack · May 24, 2024 · 631338a · 631338a
2 parents 79edbc2 + c386cdb
commit 631338a
Show file tree

Hide file tree

Showing 51 changed files with 30 additions and 11,027 deletions.
diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml
@@ -7,9 +7,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - name: Run Snyk to check for vulnerabilities
-        uses: snyk/actions/gradle@master
+      - 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
+      - uses: snyk/actions/setup@master
+      - run: snyk test --fail-on=all
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          args: --fail-on=all --all-sub-projects
diff --git a/CHANGELOG.md b/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

diff --git a/contentstack/build.gradle b/contentstack/build.gradle
@@ -10,7 +10,7 @@ android.buildFeatures.buildConfig true
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.DEFAULT)
     signAllPublications()
-    coordinates("com.contentstack.sdk", "android", "3.14.0")
+    coordinates("com.contentstack.sdk", "android", "3.15.0")
 
     pom {
         name = "contentstack-android"
@@ -146,6 +146,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) {
@@ -160,4 +163,4 @@ tasks.register('createJar', Jar) {
     include 'com/contentstack/'
     //include 'META-INF/'
 }
-createJar.dependsOn(clearJar, unzip, build)
+createJar.dependsOn(clearJar, unzip, build)