20210825

Author: ExplodingDragon

.gitignore

@@ -41,78 +41,17 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
+.idea/*
 cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
 *.iws
 
 # IntelliJ
 out/
-
-# mpeltonen/sbt-idea plugin
 .idea_modules/
-
-# JIRA plugin
 atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
-
-
-# Android studio 3.1+ serialized cache file
-.idea
-.idea/*
-
-
-
 !.gitkeep

.travis.yml

@@ -6,29 +6,18 @@ version = "last"
 buildscript {
     repositories {
         mavenLocal()
-        maven { url = project.uri("https://maven.aliyun.com/repository/public/") }
-        maven { url = project.uri("https://mirrors.163.com/maven/repository/maven-public/") }
-        // maven 中国镜像，提供加速
         mavenCentral()
-        maven { url = project.uri("https://jitpack.io") }
     }
 
-    val kotlinVersion = "1.4.32"
-
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
     }
 }
 
 allprojects {
     repositories {
         mavenLocal()
-        maven { url = project.uri("https://maven.aliyun.com/repository/gradle-plugin/") }
-        maven { url = project.uri("https://maven.aliyun.com/repository/public/") }
-        maven { url = project.uri("https://mirrors.163.com/maven/repository/maven-public/") }
-        // maven 中国镜像，提供加速
         mavenCentral()
-        maven { url = project.uri("https://jitpack.io") }
     }
 }
 

build.gradle.kts

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

gradle/wrapper/gradle-wrapper.properties

@@ -4,7 +4,7 @@ plugins {
     application
     kotlin("jvm")
     id("org.openjfx.javafxplugin") version "0.0.10"
-    id("org.beryx.jlink") version "2.23.8"
+    id("org.beryx.jlink") version "2.24.1"
 }
 
 val mainClassStr = "com.github.template.MainKt"
@@ -18,15 +18,15 @@ javafx {
 dependencies {
     implementation(kotlin("reflect"))
     implementation(kotlin("stdlib"))
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
-    testImplementation("org.junit.platform:junit-platform-launcher:1.6.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.2")
+    testImplementation("org.junit.platform:junit-platform-launcher:1.7.2")
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_11
 
 val compileKotlin: KotlinCompile by tasks
 val compileJava: JavaCompile by tasks
-compileJava.destinationDir = compileKotlin.destinationDir
+compileJava.destinationDirectory.set(compileKotlin.destinationDirectory.get())
 
 java {
     modularity.inferModulePath.set(true)
@@ -38,8 +38,8 @@ application {
 }
 
 jlink {
-    options.addAll("--strip-debug","--compress","2","--no-header-files","--no-man-pages")
-    launcher{
+    options.addAll("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages")
+    launcher {
         name = "template"
         jvmArgs = arrayListOf()
     }
@@ -55,6 +55,3 @@ tasks.test {
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = "11"
 }
-
-
-

project-cli/build.gradle.kts

@@ -10,20 +10,19 @@ import javafx.scene.layout.VBox
 import javafx.scene.text.Font
 import javafx.stage.Stage
 
-
 class Main : Application() {
     override fun start(primaryStage: Stage) {
         val root = VBox()
         root.alignment = Pos.CENTER
         val label = Label("Hello World.")
         val button = Button("CLICK")
         button.id = "button"
-        VBox.setMargin(button, Insets(30.0,0.0,0.0,0.0))
+        VBox.setMargin(button, Insets(30.0, 0.0, 0.0, 0.0))
         button.setOnAction {
             button.text = "ACCEPT"
             println("ACCEPT")
         }
-        root.children.addAll(label,button)
+        root.children.addAll(label, button)
         label.font = Font.font(24.0)
         primaryStage.scene = Scene(root, 800.0, 600.0)
         primaryStage.title = "Main"

project-cli/src/main/kotlin/com/github/template/main.kt

@@ -1,4 +1,3 @@
 rootProject.name = "GradleJavaFXKotlinTemplate"
 // 你可以修改此名称作为项目名称
 include("project-cli")
-