Skip to content

Commit

Permalink
Merge pull request #57 from contentstack/fix/dx-672
Browse files Browse the repository at this point in the history
Fix/dx 672
  • Loading branch information
abhinav-from-contentstack authored Jun 7, 2024
2 parents 39b22ac + 212f5a5 commit 309cc37
Show file tree
Hide file tree
Showing 56 changed files with 39 additions and 11,078 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
46 changes: 0 additions & 46 deletions .github/workflows/publish-snapshot.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .github/workflows/sast-scan.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/sca-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
types: [opened, synchronize, reopened]
jobs:
security:
security-sca:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
Expand All @@ -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 }}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# CHANGELOG

## Version 3.15.0

### Date: 20-May-2024

- Fixes and enhancements

---

## Version 3.14.0

### Date: 13-May-2024

- support of new sync api
- initSeqSync in stack class
- seqSync in stack class
- GCP support implementation

---
Expand Down
7 changes: 5 additions & 2 deletions contentstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand All @@ -160,4 +163,4 @@ tasks.register('createJar', Jar) {
include 'com/contentstack/'
//include 'META-INF/'
}
createJar.dependsOn(clearJar, unzip, build)
createJar.dependsOn(clearJar, unzip, build)
Loading

0 comments on commit 309cc37

Please sign in to comment.