diff --git a/VERSION b/VERSION index d917d3e..b1e80bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.1.3 diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index fa5811b..21ecd87 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -7,70 +7,71 @@ import kotlin.String * `$ ./gradlew buildSrcVersions` */ object Libs { - /** - * https://github.com/derveloper/kotlin-openapi3-dsl - */ - const val kotlin_openapi3_dsl: String = "cc.vileda:kotlin-openapi3-dsl:" + - Versions.kotlin_openapi3_dsl + const val com_github_johnrengelman_shadow_gradle_plugin: String = + "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" + + Versions.com_github_johnrengelman_shadow_gradle_plugin - /** - * http://github.com/FasterXML/jackson - */ - const val jackson_databind: String = "com.fasterxml.jackson.core:jackson-databind:" + - Versions.jackson_databind + const val de_fayard_buildsrcversions_gradle_plugin: String = + "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" + + Versions.de_fayard_buildsrcversions_gradle_plugin - /** - * https://github.com/FasterXML/jackson-module-kotlin - */ - const val jackson_module_kotlin: String = "com.fasterxml.jackson.module:jackson-module-kotlin:" + - Versions.jackson_module_kotlin + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = + "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:" + + Versions.org_jetbrains_kotlin_jvm_gradle_plugin - const val com_github_johnrengelman_shadow_gradle_plugin: String = - "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" + - Versions.com_github_johnrengelman_shadow_gradle_plugin + /** + * https://github.com/FasterXML/jackson-module-kotlin + */ + const val jackson_module_kotlin: String = + "com.fasterxml.jackson.module:jackson-module-kotlin:" + Versions.jackson_module_kotlin - const val de_fayard_buildsrcversions_gradle_plugin: String = - "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" + - Versions.de_fayard_buildsrcversions_gradle_plugin + /** + * https://kotlinlang.org/ + */ + const val kotlin_scripting_compiler_embeddable: String = + "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + + Versions.org_jetbrains_kotlin - /** - * https://javalin.io - */ - const val javalin: String = "io.javalin:javalin:" + Versions.javalin + /** + * https://kotlinlang.org/ + */ + const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + + Versions.org_jetbrains_kotlin - /** - * https://github.com/swagger-api/swagger-core - */ - const val swagger_core: String = "io.swagger.core.v3:swagger-core:" + Versions.swagger_core + /** + * https://github.com/derveloper/kotlin-openapi3-dsl + */ + const val kotlin_openapi3_dsl: String = "cc.vileda:kotlin-openapi3-dsl:" + + Versions.kotlin_openapi3_dsl - const val org_jetbrains_kotlin_jvm_gradle_plugin: String = - "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:" + - Versions.org_jetbrains_kotlin_jvm_gradle_plugin + /** + * http://github.com/FasterXML/jackson + */ + const val jackson_databind: String = "com.fasterxml.jackson.core:jackson-databind:" + + Versions.jackson_databind - /** - * https://kotlinlang.org/ - */ - const val kotlin_scripting_compiler_embeddable: String = - "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin + /** + * https://junit.org/junit5/ + */ + const val junit_jupiter: String = "org.junit.jupiter:junit-jupiter:" + Versions.junit_jupiter - /** - * https://kotlinlang.org/ - */ - const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + - Versions.org_jetbrains_kotlin + /** + * http://www.slf4j.org + */ + const val slf4j_simple: String = "org.slf4j:slf4j-simple:" + Versions.slf4j_simple - /** - * https://junit.org/junit5/ - */ - const val junit_jupiter: String = "org.junit.jupiter:junit-jupiter:" + Versions.junit_jupiter + /** + * https://github.com/swagger-api/swagger-core + */ + const val swagger_core: String = "io.swagger.core.v3:swagger-core:" + Versions.swagger_core - /** - * http://www.slf4j.org - */ - const val slf4j_simple: String = "org.slf4j:slf4j-simple:" + Versions.slf4j_simple + /** + * http://webjars.org + */ + const val swagger_ui: String = "org.webjars:swagger-ui:" + Versions.swagger_ui - /** - * http://webjars.org - */ - const val swagger_ui: String = "org.webjars:swagger-ui:" + Versions.swagger_ui + /** + * https://javalin.io + */ + const val javalin: String = "io.javalin:javalin:" + Versions.javalin } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1cbe45b..2ed3a26 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -12,38 +12,36 @@ import org.gradle.plugin.use.PluginDependencySpec * YOU are responsible for updating manually the dependency version. */ object Versions { - const val kotlin_openapi3_dsl: String = "0.20.2" + const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.1.0" - const val jackson_databind: String = "2.10.0.pr1" + const val de_fayard_buildsrcversions_gradle_plugin: String = "0.6.1" - const val jackson_module_kotlin: String = "2.10.0.pr1" + const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.50" - const val com_github_johnrengelman_shadow_gradle_plugin: String = "5.1.0" + const val jackson_module_kotlin: String = "2.10.0.pr3" - const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2" + const val org_jetbrains_kotlin: String = "1.3.50" - const val javalin: String = "3.4.1" + const val kotlin_openapi3_dsl: String = "0.20.2" - const val swagger_core: String = "2.0.9" + const val jackson_databind: String = "2.10.0.pr3" - const val org_jetbrains_kotlin_jvm_gradle_plugin: String = "1.3.50" + const val junit_jupiter: String = "5.5.2" - const val org_jetbrains_kotlin: String = "1.3.50" + const val slf4j_simple: String = "1.7.28" - const val junit_jupiter: String = "5.5.1" + const val swagger_core: String = "2.0.9" - const val slf4j_simple: String = "1.7.28" + const val swagger_ui: String = "3.23.8" - const val swagger_ui: String = "3.23.5" + const val javalin: String = "3.5.0" - /** - * - * See issue 19: How to update Gradle itself? - * https://github.com/jmfayard/buildSrcVersions/issues/19 - */ - const val gradleLatestVersion: String = "5.6.1" - - const val gradleCurrentVersion: String = "5.6.1" + /** + * Current version: "5.6.2" + * See issue 19: How to update Gradle itself? + * https://github.com/jmfayard/buildSrcVersions/issues/19 + */ + const val gradleLatestVersion: String = "5.6.2" } /** @@ -51,5 +49,5 @@ object Versions { * https://github.com/jmfayard/buildSrcVersions/issues/47 */ val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec - inline get() = - id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin) + inline get() = + id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59b5f89..7c4388a 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-5.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 8e25e6c..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/justfile b/justfile index 5db395e..d55211c 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,7 @@ version := `cat VERSION` push: build - scp ./build/libs/slackmemes-{{version}}-all.jar anthonycicchetti.com:/home/acicchetti/slackbot.jar + rsync ./build/libs/slackmemes-{{version}}-all.jar acicchetti@anthonycicchetti.com:/home/acicchetti/slackbot.jar build: ./gradlew shadowJar