Skip to content

fix(deps): update dependency com.android.tools.build:gradle to v3.6.4 - abandoned #35

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

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

fix(deps): update dependency com.android.tools.build:gradle to v3.6.4 - abandoned #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
265dfb3
chore(deps): update dependency gradle to v6.9
renovate-bot May 7, 2021
abc40a0
chore(deps): update dependency hosted-git-info to 2.8.9 [security]
renovate-bot May 10, 2021
4af82e5
chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9
dependabot[bot] May 11, 2021
cc4555c
Merge pull request #27 from koromerzhin/dependabot/npm_and_yarn/hoste…
koromerzhin Jun 4, 2021
9ce9dac
Merge pull request #26 from koromerzhin/renovate/npm-hosted-git-info-…
koromerzhin Jun 4, 2021
1ec328e
Merge pull request #25 from koromerzhin/renovate/gradle-6.x
koromerzhin Jun 4, 2021
f09d5e0
chore(deps): update dependency jscpd to v3.3.26
renovate-bot Jun 4, 2021
a937342
chore(deps): update dependency gradle to v7
renovate-bot Jun 4, 2021
e72d370
Merge pull request #29 from koromerzhin/renovate/jscpd-3.x
koromerzhin Jun 4, 2021
90d168e
Merge pull request #24 from koromerzhin/renovate/gradle-7.x
koromerzhin Jun 4, 2021
d65bb8c
chore(deps): update dependency gradle to v7.1
renovate-bot Jun 14, 2021
9df8ad8
Merge pull request #30 from koromerzhin/renovate/gradle-7.x
koromerzhin Jun 22, 2021
ef6684e
feat(makefile): add arguments
koromerzhin Aug 17, 2021
609ab76
feat(docker): update to lampy
koromerzhin Aug 19, 2021
abb1c42
chore(deps): update dependency com.android.tools.build:gradle to v3.6.4
renovate-bot Aug 30, 2021
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "make"]
path = make
url = git@github.com:koromerzhin/make.git
39 changes: 3 additions & 36 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion apps/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-7.1-all.zip
1 change: 1 addition & 0 deletions make
Open in desktop
Submodule make added at b7934a
101 changes: 54 additions & 47 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down