Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/dx 87 removing okio txtmark folder #54

Merged
merged 4 commits into from
May 24, 2024
Merged

Fix/dx 87 removing okio txtmark folder #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f343df0
removed okio and txtmark folders and added dependencies
reeshika-h May 9, 2024
1e89280
update version and changelog
reeshika-h May 9, 2024
5ad4ae7
Merge remote-tracking branch 'origin' into fix/DX-87-removing-okio-tx…
reeshika-h May 21, 2024
c386cdb
Update sca-scan.yml
aravindbuilt May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/sca-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## Version 3.15.0

### Date: 20-May-2024

- Fixes and enhancements

---

## Version 3.14.0

### Date: 13-May-2024
Expand Down
7 changes: 5 additions & 2 deletions contentstack/build.gradle
View file
Open in desktop
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
Loading