Skip to content

Commit

Permalink
Merge pull request #37 from VerusCoin/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Asherda authored Aug 3, 2020
2 parents 0d03212 + 4a02ce0 commit a0910c3
Show file tree
Hide file tree
Showing 4 changed files with 283 additions and 257 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ stages:
- build

variables:
VERSION: 0.1.10-beta
VERSION: 0.1.10-beta-1
POST_MESSAGE: "Pipeline Trigger: ${CI_PIPELINE_SOURCE}\n
Branch: ${CI_COMMIT_REF_NAME}\n
Commit: ${CI_COMMIT_SHA}\n
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.android.build.OutputFile
def versionMajor = 0
def versionMinor = 1
def versionRevision = 10
def versionBuild = 0
def versionBuild = 1

def keystorePropertiesFile = rootProject.file("keystore.properties");

Expand Down
10 changes: 7 additions & 3 deletions package.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@
"https-browserify": "0.0.1",
"istanbul-reports": "^2.1.1",
"jsqr": "^0.2.2",
"lodash": "^4.17.15",
"lodash": "^4.17.19",
"meteor-node-stubs": "~0.2.4",
"node-gyp": "^3.8.0",
"nodejs-aes256": "^1.0.1",
"patch-package": "^6.1.2",
"path-browserify": "0.0.0",
"postinstall-postinstall": "^2.0.0",
"prop-types": "^15.7.2",
"punycode": "^1.4.1",
"qrcode.react": "^0.7.1",
"querystring-es3": "^0.2.1",
"react": "16.8.3",
Expand Down Expand Up @@ -114,7 +115,7 @@
"rn-nodeify": "github:tradle/rn-nodeify"
},
"resolutions": {
"lodash": "^4.17.15",
"lodash": "^4.17.19",
"typeforce": "git+https://github.com/michaeltout/typeforce",
"braces": "^3.0.2",
"tar": "^4.4.8",
Expand All @@ -125,7 +126,10 @@
"handlebars": "^4.5.3",
"acorn": "^6.4.0",
"kind-of": "6.0.3",
"minimist": "0.2.1"
"minimist": "0.2.1",
"elliptic": "^6.5.3",
"dot-prop": "^5.2.0",
"yargs-parser": "^18.1.3"
},
"jest": {
"preset": "react-native",
Expand Down
Loading

0 comments on commit a0910c3

Please sign in to comment.