Merge branch 'develop'

ADVisualizer · Nov 16, 2018 · 3e1957f · 3e1957f
2 parents 923c26c + 83ce153
commit 3e1957f
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/ui-core/build.gradle b/ui-core/build.gradle
@@ -2,15 +2,9 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    dependencies {
-        classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
-    }
 }
 
 apply plugin: 'application'
-apply plugin: 'com.google.osdetector'
-
-ext.platform = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
 
 dependencies {
     compile 'de.jensd:fontawesomefx-fontawesome:4+'
@@ -19,10 +13,20 @@ dependencies {
     compile 'de.jensd:shichimifx:1.0.5'
 
     // https://mvnrepository.com/artifact/org.openjfx/javafx-controls
-    compile "org.openjfx:javafx-base:11:$platform"
-    compile "org.openjfx:javafx-graphics:11:$platform"
-    compile "org.openjfx:javafx-controls:11:$platform"
-    compile "org.openjfx:javafx-fxml:11:$platform"
+    compile "org.openjfx:javafx-base:11:win"
+    compile "org.openjfx:javafx-graphics:11:win"
+    compile "org.openjfx:javafx-controls:11:win"
+    compile "org.openjfx:javafx-fxml:11:win"
+
+    compile "org.openjfx:javafx-base:11:linux"
+    compile "org.openjfx:javafx-graphics:11:linux"
+    compile "org.openjfx:javafx-controls:11:linux"
+    compile "org.openjfx:javafx-fxml:11:linux"
+
+    compile "org.openjfx:javafx-base:11:mac"
+    compile "org.openjfx:javafx-graphics:11:mac"
+    compile "org.openjfx:javafx-controls:11:mac"
+    compile "org.openjfx:javafx-fxml:11:mac"
 
 
     // common dependencies