From a442252d7e0cc322ad97f53bcebe1e9e8eecfaeb Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Fri, 21 Jun 2019 04:43:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20JFoenixParts=20=D0=B8=20openjfx=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20java=2012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 +++ JFoenixParts | 1 + Launcher/build.gradle | 5 +++++ settings.gradle | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 160000 JFoenixParts diff --git a/.gitmodules b/.gitmodules index 8d20570a..386c83a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "Radon"] path = Radon url = git@github.com:GravitLauncher/Radon.git +[submodule "JFoenixParts"] + path = JFoenixParts + url = git@github.com:leshasmlesha/JFoenixParts.git diff --git a/JFoenixParts b/JFoenixParts new file mode 160000 index 00000000..f67c688c --- /dev/null +++ b/JFoenixParts @@ -0,0 +1 @@ +Subproject commit f67c688cc3bb5fdec544e412f4d499600961b2c4 diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 1cd76ea4..c7523ee1 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -38,6 +38,11 @@ dependencies { pack project(':LauncherAuthlib') + compile group: 'org.openjfx', name: 'javafx-controls', version: '12', classifier: 'win' + compile group: 'org.openjfx', name: 'javafx-graphics', version: '12', classifier: 'win' + compile group: 'org.openjfx', name: 'javafx-base', version: '12', classifier: 'win' + compile group: 'org.openjfx', name: 'javafx-fxml', version: '12', classifier: 'win' + bundle 'com.jfoenixparts:jfoenixparts' bundle 'com.github.oshi:oshi-core:3.13.0' bundle 'de.jensd:fontawesomefx:8.9' bundle 'org.apache.httpcomponents:httpclient:4.5.7' diff --git a/settings.gradle b/settings.gradle index 72971c4c..35287581 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ rootProject.name = 'GravitLauncher' - +includeBuild 'JFoenixParts' include 'Launcher' include 'Radon' include 'LauncherCore'