Merge branch 'dep-update' of anthonycicc/slackbot into master

This commit is contained in:
Anthony Cicchetti 2020-03-14 10:33:21 -04:00 committed by Gitea
commit e819cf0b3a
4 changed files with 24 additions and 30 deletions

View file

@ -12,37 +12,36 @@ import org.gradle.plugin.use.PluginDependencySpec
* YOU are responsible for updating manually the dependency version.
*/
object Versions {
const val org_jetbrains_kotlin: String = "1.3.61" // available: "1.3.61"
const val org_jetbrains_kotlin: String = "1.3.70"
const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.2.0"
// available: "5.2.0"
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.61" // available: "1.3.61"
const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.70"
const val jackson_module_kotlin: String = "2.10.1" // available: "2.10.1"
const val jackson_module_kotlin: String = "2.10.3"
const val kotlin_openapi3_dsl: String = "0.20.2"
const val jackson_databind: String = "2.10.1" // available: "2.10.1"
const val jackson_databind: String = "2.10.3"
const val junit_jupiter: String = "5.5.2"
const val junit_jupiter: String = "5.6.0"
const val slf4j_simple: String = "1.7.30" // available: "1.7.30"
const val slf4j_simple: String = "1.7.30"
const val swagger_core: String = "2.1.0" // available: "2.1.0"
const val swagger_core: String = "2.1.1"
const val swagger_ui: String = "3.24.3" // available: "3.24.3"
const val swagger_ui: String = "3.25.0"
const val javalin: String = "3.6.0" // available: "3.6.0"
const val javalin: String = "3.7.0"
/**
* Current version: "5.6.2"
* Current version: "6.2.2"
* See issue 19: How to update Gradle itself?
* https://github.com/jmfayard/buildSrcVersions/issues/19
*/
const val gradleLatestVersion: String = "6.0.1"
const val gradleLatestVersion: String = "6.2.2"
}
/**

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

29
gradlew vendored
View file

@ -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" "$@"