update gradlew, javafx, ktlint, ktlint-gradle, shadowJar

tuProlog · Oct 22, 2020 · 802683d · 802683d
1 parent 9a66eb5
commit 802683d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
@@ -39,6 +39,12 @@ object Libs {
     const val orchidplugindocs: String = "io.github.javaeden.orchid:OrchidPluginDocs:" +
             Versions.io_github_javaeden_orchid
 
+    /**
+     * https://kotlinlang.org/
+     */
+    const val kotlin_reflect: String = "org.jetbrains.kotlin:kotlin-reflect:" +
+            Versions.org_jetbrains_kotlin
+
     /**
      * https://kotlinlang.org/
      */
@@ -98,6 +104,11 @@ object Libs {
      */
     const val javafx_controls: String = "org.openjfx:javafx-controls:" + Versions.org_openjfx
 
+    /**
+     * https://openjdk.java.net/projects/openjfx/
+     */
+    const val javafx_fxml: String = "org.openjfx:javafx-fxml:" + Versions.org_openjfx
+
     /**
      * https://openjdk.java.net/projects/openjfx/
      */

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,3 +1,4 @@
+import kotlin.String
 import org.gradle.plugin.use.PluginDependenciesSpec
 import org.gradle.plugin.use.PluginDependencySpec
 
@@ -17,7 +18,7 @@ object Versions {
 
     const val org_jetbrains_kotlin: String = "1.4.10"
 
-    const val org_openjfx: String = "15" // "11.0.2" // available: "15"
+    const val org_openjfx: String = "15.0.1"
 
     const val org_antlr: String = "4.8-1"
 
@@ -27,17 +28,17 @@ object Versions {
 
     const val org_jetbrains_kotlin_multiplatform_gradle_plugin: String = "1.4.10"
 
-    const val com_github_johnrengelman_shadow_gradle_plugin: String = "6.0.0"
+    const val com_github_johnrengelman_shadow_gradle_plugin: String = "6.1.0"
 
-    const val org_jlleitschuh_gradle_ktlint_gradle_plugin: String = "9.4.0"
+    const val org_jlleitschuh_gradle_ktlint_gradle_plugin: String = "9.4.1"
 
     const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
 
     const val org_openjfx_javafxplugin_gradle_plugin: String = "0.0.9"
 
     const val com_eden_orchidplugin_gradle_plugin: String = "0.21.1"
 
-    const val org_jetbrains_dokka_gradle_plugin: String = "0.10.1" // available: "1.4.10"
+    const val org_jetbrains_dokka_gradle_plugin: String = "0.10.1" // available: "1.4.10.2"
 
     const val com_jfrog_bintray_gradle_plugin: String = "1.8.5"
 
@@ -56,11 +57,11 @@ object Versions {
     const val ktlint: String = "0.39.0"
 
     /**
-     * Current version: "6.6.1"
+     * Current version: "6.7"
      * See issue 19: How to update Gradle itself?
      * https://github.com/jmfayard/buildSrcVersions/issues/19
      */
-    const val gradleLatestVersion: String = "6.6.1"
+    const val gradleLatestVersion: String = "6.7"
 }
 
 /**

diff --git 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.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists