Merge branch 'develop' into feature/12-user-info-in-jwt

Merge branch 'master' into develop
Add gradle wrapper
2021-08-23 19:57:52 -04:00 · 2021-08-23 19:56:04 -04:00 · 2021-08-23 19:08:17 -04:00
3 changed files with 10 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,8 +4,8 @@
 *.iml
 *.ipr

+## Other directories
 .gradle/
-gradle/
 build/
 logs/
 data/
@ -13,6 +13,8 @@ dokka/
 dist/
 out/

-/src/main/resources/angular/static/*
-
+## Generated configuration file
 config.properties
+
+## Prevent ignoring the gradle wrapper
+!gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
Author	SHA1	Message	Date
FyloZ	e48fb283c3	Merge branch 'develop' into feature/12-user-info-in-jwt	2021-08-23 19:57:52 -04:00
FyloZ	360ac93409	Merge branch 'master' into develop continuous-integration/drone/push Build is passing Details	2021-08-23 19:56:04 -04:00
FyloZ	e1cbb746fa	Add gradle wrapper continuous-integration/drone/push Build is failing Details	2021-08-23 19:08:17 -04:00