diff --git a/.gitignore b/.gitignore index 37b747d..a639669 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /buildSrc/build/ /.idea/ /build/ +/**/build/ diff --git a/app/build.gradle.kts b/app/build.gradle.kts deleted file mode 100644 index dc482ed..0000000 --- a/app/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -plugins { - id("elex-application") -} -application{ - mainClass.set("com.elex_project.sample.Application") -} -dependencies { - - -} diff --git a/app/src/main/java/com/elex_project/sample/package-info.java b/app/src/main/java/com/elex_project/sample/package-info.java deleted file mode 100644 index f7a784a..0000000 --- a/app/src/main/java/com/elex_project/sample/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.elex_project.sample; diff --git a/build.gradle.kts b/build.gradle.kts index e4f4545..e7cf9af 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,13 @@ buildscript { url = uri("https://repository.elex-project.com/repository/maven") } } - - dependencies { - classpath ("com.jaredsburrows:gradle-license-plugin:0.8.90") - } } + plugins { + base id("com.github.ben-manes.versions") version "0.39.0" } + +subprojects{ + +} diff --git a/buildSrc/src/main/kotlin/elex-application.gradle.kts b/buildSrc/src/main/kotlin/elex-application.gradle.kts index 793b831..8846635 100644 --- a/buildSrc/src/main/kotlin/elex-application.gradle.kts +++ b/buildSrc/src/main/kotlin/elex-application.gradle.kts @@ -10,8 +10,7 @@ tasks.jar { "Implementation-Title" to project.name, "Implementation-Version" to project.version, "Implementation-Vendor" to "ELEX co.,pte.", - "Main-Class" to application.mainClass, - "Automatic-Module-Name" to "com.elex_project.${project.name}" + "Main-Class" to application.mainClass )) } } diff --git a/buildSrc/src/main/kotlin/elex-base.gradle.kts b/buildSrc/src/main/kotlin/elex-base.gradle.kts index f90592e..3428a87 100644 --- a/buildSrc/src/main/kotlin/elex-base.gradle.kts +++ b/buildSrc/src/main/kotlin/elex-base.gradle.kts @@ -15,8 +15,8 @@ repositories { java { withSourcesJar() withJavadocJar() - sourceCompatibility = org.gradle.api.JavaVersion.VERSION_1_8 - targetCompatibility = org.gradle.api.JavaVersion.VERSION_1_8 + sourceCompatibility = org.gradle.api.JavaVersion.VERSION_11 + targetCompatibility = org.gradle.api.JavaVersion.VERSION_11 } configurations { @@ -54,7 +54,7 @@ tasks.javadoc { dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) implementation("org.slf4j:slf4j-api:1.7.30") - implementation("org.jetbrains:annotations:21.0.1") + implementation("org.jetbrains:annotations:22.0.0") compileOnly("org.projectlombok:lombok:1.18.20") annotationProcessor("org.projectlombok:lombok:1.18.20") diff --git a/fxml/build.gradle.kts b/fxml/build.gradle.kts new file mode 100644 index 0000000..6068989 --- /dev/null +++ b/fxml/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + id("elex-application") + id("org.openjfx.javafxplugin") version "0.0.10" + id("org.beryx.jlink") version "2.23.1" +} +application { + mainClass.set("kr.pe.elex.examples.fxml.FxmlApplication") + mainModule.set("kr.pe.elex.examples.fxml") +} +javafx { + version = "11.0.2" + modules = listOf("javafx.controls", "javafx.fxml") +} +dependencies { + + +} diff --git a/fxml/src/main/java/kr/pe/elex/examples/fxml/FxmlApplication.java b/fxml/src/main/java/kr/pe/elex/examples/fxml/FxmlApplication.java new file mode 100644 index 0000000..7bae5d1 --- /dev/null +++ b/fxml/src/main/java/kr/pe/elex/examples/fxml/FxmlApplication.java @@ -0,0 +1,28 @@ +package kr.pe.elex.examples.fxml; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import java.util.Objects; + +public class FxmlApplication extends Application { + public static void main(String... args) { + launch(args); + } + + @Override + public void start(Stage primaryStage) throws Exception { + primaryStage.setTitle("Hello!"); + primaryStage.setWidth(800); + primaryStage.setHeight(600); + //GridPane root = new GridPane(); + Parent root = FXMLLoader.load(Objects.requireNonNull(getClass() + .getResource("/fxml/root.fxml"))); + Scene scene = new Scene(root); + primaryStage.setScene(scene); + primaryStage.show(); + } +} diff --git a/fxml/src/main/java/module-info.java b/fxml/src/main/java/module-info.java new file mode 100644 index 0000000..7f861a5 --- /dev/null +++ b/fxml/src/main/java/module-info.java @@ -0,0 +1,7 @@ +module javafx.examples.fxml.main { + requires javafx.graphics; + requires javafx.controls; + requires javafx.fxml; + + exports kr.pe.elex.examples.fxml; +} diff --git a/fxml/src/main/resources/fxml/root.fxml b/fxml/src/main/resources/fxml/root.fxml new file mode 100644 index 0000000..c772e85 --- /dev/null +++ b/fxml/src/main/resources/fxml/root.fxml @@ -0,0 +1,34 @@ + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts deleted file mode 100644 index 8367881..0000000 --- a/lib/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("elex-library") -} - -dependencies { - -} diff --git a/lib/src/main/java/com/elex_project/sample/package-info.java b/lib/src/main/java/com/elex_project/sample/package-info.java deleted file mode 100644 index f7a784a..0000000 --- a/lib/src/main/java/com/elex_project/sample/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.elex_project.sample; diff --git a/settings.gradle.kts b/settings.gradle.kts index cb2993d..b6022fa 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,2 @@ rootProject.name = "javafx-examples" -include("lib", "app") +include("fxml")