From 265dfb360efffaec3d7d2fe9decb8a98ac2c26b2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 7 May 2021 14:30:31 +0000 Subject: [PATCH 1/9] chore(deps): update dependency gradle to v6.9 --- apps/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/android/gradle/wrapper/gradle-wrapper.properties b/apps/android/gradle/wrapper/gradle-wrapper.properties index 039eda9..3df6b33 100644 --- a/apps/android/gradle/wrapper/gradle-wrapper.properties +++ b/apps/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip From abc40a04c01bec31ac966b60dee47c05adeaa01c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 10 May 2021 07:58:21 +0000 Subject: [PATCH 2/9] chore(deps): update dependency hosted-git-info to 2.8.9 [security] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b613f59..9d6881e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -910,9 +910,9 @@ "dev": true }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "human-signals": { From 4af82e5dbc54e548eb7e0dffde87667d4156b31b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 May 2021 23:26:57 +0000 Subject: [PATCH 3/9] chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9 Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b613f59..9d6881e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -910,9 +910,9 @@ "dev": true }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "human-signals": { From f09d5e007003ef02a567d60c1388a274f1401688 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 4 Jun 2021 08:11:47 +0000 Subject: [PATCH 4/9] chore(deps): update dependency jscpd to v3.3.26 --- package-lock.json | 95 +++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d6881e..80dbac2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,9 +83,9 @@ } }, "@babel/parser": { - "version": "7.13.11", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz", - "integrity": "sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz", + "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==", "dev": true }, "@babel/runtime": { @@ -98,14 +98,21 @@ } }, "@babel/types": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz", - "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==", + "version": "7.14.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz", + "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-validator-identifier": "^7.14.0", "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "@babel/helper-validator-identifier": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", + "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==", + "dev": true + } } }, "@jscpd/core": { @@ -118,9 +125,9 @@ } }, "@jscpd/finder": { - "version": "3.3.25", - "resolved": "https://registry.npmjs.org/@jscpd/finder/-/finder-3.3.25.tgz", - "integrity": "sha512-Q7OFmLxzA7K6e4wcFj1kWTsofFeLUkPiNwA8CcSscwrsuWPyBwyAui/jEYvGQyIG06b4oCrrVF/V2iwQWx1sUw==", + "version": "3.3.26", + "resolved": "https://registry.npmjs.org/@jscpd/finder/-/finder-3.3.26.tgz", + "integrity": "sha512-FGWIIhLELpeD2tkVjn+8QKnzX3nLAXkkcGTo+qWzEaqxvHsIGgeaP+TT3gHZM1Xm5eg6pb4j23nLY0h4UwEw0w==", "dev": true, "requires": { "@jscpd/core": "^3.3.17", @@ -136,9 +143,9 @@ } }, "@jscpd/html-reporter": { - "version": "3.3.22", - "resolved": "https://registry.npmjs.org/@jscpd/html-reporter/-/html-reporter-3.3.22.tgz", - "integrity": "sha512-hn92VSK26XM+83FMhUSw9NLeruUK92S/DEJl/HFA/kkWleElk2HvSxOCtiyet0vsTdVPdp6cQBF+jVaxWsMvcg==", + "version": "3.3.26", + "resolved": "https://registry.npmjs.org/@jscpd/html-reporter/-/html-reporter-3.3.26.tgz", + "integrity": "sha512-Ijpy6aW951P5NKZUYM+PTcNcqJGQx1+D+TU3HPRaOEGQfiD9i3pz/0VFs6oOVTuQBwWJSp4ojhaWfHo9GS45dg==", "dev": true, "requires": { "colors": "^1.4.0", @@ -157,28 +164,28 @@ } }, "@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.4", + "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true }, "@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz", + "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==", "dev": true, "requires": { - "@nodelib/fs.scandir": "2.1.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, @@ -1044,13 +1051,13 @@ "dev": true }, "is-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz", - "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz", + "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==", "dev": true, "requires": { "call-bind": "^1.0.2", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-stream": { @@ -1157,14 +1164,14 @@ } }, "jscpd": { - "version": "3.3.25", - "resolved": "https://registry.npmjs.org/jscpd/-/jscpd-3.3.25.tgz", - "integrity": "sha512-xg+gGgmvx7gPnZjmcYqraQnk845AdvSJvHx3qrgKDjFfiY2e6dYzosPpSh6zuDEk2XT9cqHMrOliGbkuts/YEQ==", + "version": "3.3.26", + "resolved": "https://registry.npmjs.org/jscpd/-/jscpd-3.3.26.tgz", + "integrity": "sha512-Til3rI11zsNHdHhlzfk3PDVdAgDTf3KVOF2Qw9Z+6u8vnTOdF9fHY0SrUFYWqCpEjbOOO0ToJAUgWPwkG/YYeg==", "dev": true, "requires": { "@jscpd/core": "^3.3.17", - "@jscpd/finder": "^3.3.25", - "@jscpd/html-reporter": "^3.3.22", + "@jscpd/finder": "^3.3.26", + "@jscpd/html-reporter": "^3.3.26", "@jscpd/tokenizer": "^3.3.24", "colors": "^1.4.0", "commander": "^5.0.0", @@ -1508,13 +1515,13 @@ "dev": true }, "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { "braces": "^3.0.1", - "picomatch": "^2.0.5" + "picomatch": "^2.2.3" } }, "mimic-fn": { @@ -1753,9 +1760,9 @@ "dev": true }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, "pify": { @@ -1908,9 +1915,9 @@ } }, "queue-microtask": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz", - "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, "rc": { diff --git a/package.json b/package.json index fdace19..b444b40 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "devDependencies": { "all-contributors-cli": "6.20.0", "generate-changelog": "1.8.0", - "jscpd": "3.3.25", + "jscpd": "3.3.26", "license-checker": "25.0.1", "markdownlint-cli": "0.27.1", "readme-md-generator": "1.0.0" From a937342a184043641e4e8c6b01d99199024ead37 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 4 Jun 2021 08:11:52 +0000 Subject: [PATCH 5/9] chore(deps): update dependency gradle to v7 --- apps/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/android/gradle/wrapper/gradle-wrapper.properties b/apps/android/gradle/wrapper/gradle-wrapper.properties index 3df6b33..b8793d3 100644 --- a/apps/android/gradle/wrapper/gradle-wrapper.properties +++ b/apps/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From d65bb8c8eb9aac00f886751edfd6ded68f4fa652 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Jun 2021 15:52:58 +0000 Subject: [PATCH 6/9] chore(deps): update dependency gradle to v7.1 --- apps/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/android/gradle/wrapper/gradle-wrapper.properties b/apps/android/gradle/wrapper/gradle-wrapper.properties index b8793d3..98f029c 100644 --- a/apps/android/gradle/wrapper/gradle-wrapper.properties +++ b/apps/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip From ef6684e5c16c578f31173bc934a0beccc74959a7 Mon Sep 17 00:00:00 2001 From: koromerzhin <308012+koromerzhin@users.noreply.github.com> Date: Tue, 17 Aug 2021 11:36:36 +0200 Subject: [PATCH 7/9] feat(makefile): add arguments --- .github/workflows/ci.yml | 2 ++ .gitmodules | 3 +++ Makefile | 39 +++------------------------------------ make | 1 + 4 files changed, 9 insertions(+), 36 deletions(-) create mode 100644 .gitmodules create mode 160000 make diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00c1577..f771b06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + submodules: recursive - name: Cache npm packages id: npm-cache uses: actions/cache@v2 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7d66650 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "make"] + path = make + url = git@github.com:koromerzhin/make.git diff --git a/Makefile b/Makefile index bec3a5a..d111cee 100644 --- a/Makefile +++ b/Makefile @@ -1,48 +1,15 @@ -.DEFAULT_GOAL := help +include make/general/Makefile -SUPPORTED_COMMANDS := contributors git linter +SUPPORTED_COMMANDS := linter SUPPORTS_MAKE_ARGS := $(findstring $(firstword $(MAKECMDGOALS)), $(SUPPORTED_COMMANDS)) ifneq "$(SUPPORTS_MAKE_ARGS)" "" COMMAND_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS)) $(eval $(COMMAND_ARGS):;@:) endif -help: - @grep -E '(^[a-zA-Z_-]+:.*?##.*$$)|(^##)' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}' | sed -e 's/\[32m##/[33m/' - -node_modules: - @npm install - install: node_modules ## Installation application -contributors: node_modules ## Contributors -ifeq ($(COMMAND_ARGS),add) - @npm run contributors add -else ifeq ($(COMMAND_ARGS),check) - @npm run contributors check -else ifeq ($(COMMAND_ARGS),generate) - @npm run contributors generate -else - @npm run contributors -endif - -git: node_modules ## Scripts GIT -ifeq ($(COMMAND_ARGS),status) - @git status -else ifeq ($(COMMAND_ARGS),check) - @make contributors check -i - @make linter all -i - @make git status -i -else - @echo "ARGUMENT missing" - @echo "---" - @echo "make git ARGUMENT" - @echo "---" - @echo "check: CHECK before" - @echo "status: status" -endif - -linter: node_modules ## Scripts Linter +linter: node_modules ### Scripts Linter ifeq ($(COMMAND_ARGS),all) @make linter readme -i else ifeq ($(COMMAND_ARGS),readme) diff --git a/make b/make new file mode 160000 index 0000000..f52a020 --- /dev/null +++ b/make @@ -0,0 +1 @@ +Subproject commit f52a020f25f650b7638a3b5c6ba15f63c40a6e79 From 609ab76927532099e1df9aaf4feebccb63db446b Mon Sep 17 00:00:00 2001 From: koromerzhin <308012+koromerzhin@users.noreply.github.com> Date: Thu, 19 Aug 2021 16:35:11 +0200 Subject: [PATCH 8/9] feat(docker): update to lampy --- make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make b/make index f52a020..b7934a5 160000 --- a/make +++ b/make @@ -1 +1 @@ -Subproject commit f52a020f25f650b7638a3b5c6ba15f63c40a6e79 +Subproject commit b7934a5d7738f9a24740acb30cbd8e293bfdcccb From abb1c42dbf0d206b6ee164ad971ebee39f982bee Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 30 Aug 2021 09:08:13 +0000 Subject: [PATCH 9/9] chore(deps): update dependency com.android.tools.build:gradle to v3.6.4 --- apps/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/android/build.gradle b/apps/android/build.gradle index 3100ad2..dae7f94 100644 --- a/apps/android/build.gradle +++ b/apps/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.6.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }