aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle12
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin55616 -> 58702 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rwxr-xr-xgradlew29
-rw-r--r--package.json8
5 files changed, 23 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle
index bc0f3d0e..d952107c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
classpath 'io.github.swagger2markup:swagger2markup-gradle-plugin:1.3.3'
}
}
@@ -153,7 +153,7 @@ dependencies {
compileOnly 'io.springfox:springfox-core:2.9.2'
compile 'org.apache.commons:commons-email:1.5'
- compile 'com.github.scribejava:scribejava-apis:6.8.1'
+ compile 'com.github.scribejava:scribejava-apis:6.9.0'
compile 'com.github.pengrad:java-telegram-bot-api:4.4.0'
compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.4.2'
compile 'org.imgscalr:imgscalr-lib:4.2'
@@ -167,9 +167,9 @@ dependencies {
compile 'org.flywaydb:flyway-core:5.2.4'
- runtime 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
- runtime 'net.java.dev.jna:jna:5.4.0'
- runtime 'net.java.dev.jna:jna-platform:5.4.0'
+ runtime 'org.mariadb.jdbc:mariadb-java-client:2.5.1'
+ runtime 'net.java.dev.jna:jna:5.5.0'
+ runtime 'net.java.dev.jna:jna-platform:5.5.0'
runtime 'com.h2database:h2:1.4.199'
compile 'com.github.ooxi:serialized-php-parser:0.5.0'
@@ -177,7 +177,7 @@ dependencies {
compile 'com.atlassian.commonmark:commonmark:0.13.0'
compile 'com.atlassian.commonmark:commonmark-ext-autolink:0.13.0'
compile 'org.tomitribe:tomitribe-http-signatures:1.3'
- compile 'com.google.api-client:google-api-client:1.30.4'
+ compile 'com.google.api-client:google-api-client:1.30.5'
compile "com.kotcrab.remark:remark:1.2.0"
testCompile("org.springframework.boot:spring-boot-starter-test")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf0..cc4fdc29 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c1bf7ea..aaaa7e54 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfd..2fe81a7d 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@@ -175,14 +175,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/package.json b/package.json
index 32581f76..b6423162 100644
--- a/package.json
+++ b/package.json
@@ -26,9 +26,9 @@
"@babel/core": "^7.6.4",
"@babel/preset-env": "^7.6.3",
"babel-loader": "^8.0.6",
- "core-js": "^3.3.3",
+ "core-js": "^3.3.6",
"css-loader": "^3.2.0",
- "eslint": "6.5.1",
+ "eslint": "6.6.0",
"eslint-loader": "3.0.2",
"eslint-plugin-only-ascii": "0.0.0",
"file-loader": "^4.2.0",
@@ -42,11 +42,11 @@
"stylelint-config-standard": "^19.0.0",
"url-loader": "^2.2.0",
"webpack": "^4.41.2",
- "webpack-cli": "^3.3.9"
+ "webpack-cli": "^3.3.10"
},
"dependencies": {
"classlist.js": "^1.1.20150312",
- "element-closest": "3.0.1",
+ "element-closest": "3.0.2",
"evil-icons": "^1.10.1",
"formdata-polyfill": "^3.0.19",
"svg4everybody": "^2.1.9",