瀏覽代碼

Merge pull request #38 from palexdev/staging

Version 11.11.0, merge from staging
Alessadro Parisi 4 年之前
父節點
當前提交
2d5e4f75c7
共有 4 個文件被更改,包括 13 次插入5 次删除
  1. 2 2
      README.md
  2. 1 1
      build.gradle
  3. 9 1
      materialfx/build.gradle
  4. 1 1
      materialfx/gradle.properties

+ 2 - 2
README.md

@@ -101,7 +101,7 @@ repositories {
 }
 
 dependencies {
-implementation 'io.github.palexdev:materialfx:11.10.1'
+implementation 'io.github.palexdev:materialfx:11.11.0'
 }
 ```
 
@@ -111,7 +111,7 @@ implementation 'io.github.palexdev:materialfx:11.10.1'
 <dependency>
   <groupId>io.github.palexdev</groupId>
   <artifactId>materialfx</artifactId>
-  <version>11.10.1</version>
+  <version>11.11.0</version>
 </dependency>
 ```
 

+ 1 - 1
build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'io.github.palexdev'
-version '11.10.1'
+version '11.11.0'
 
 repositories {
     mavenCentral()

+ 9 - 1
materialfx/build.gradle

@@ -1,3 +1,5 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 plugins {
     id 'biz.aQute.bnd.builder' version '5.2.0'
     id 'com.vanniktech.maven.publish' version '0.13.0'
@@ -63,7 +65,13 @@ jar {
 
 task copyJar(type: Copy) {
     from jar
-    into 'C:/Users/thund/AppData/Roaming/Scene Builder/Library'
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        into System.getenv("APPDATA") + '/Scene Builder/Library'
+    } else if(Os.isFamily(Os.FAMILY_MAC)) {
+        into System.getProperty("user.home") + '/Library/Application Support' + '/Scene Builder/Library'
+    } else if(Os.isFamily(Os.FAMILY_UNIX)) {
+        into System.getProperty("user.home") + '/.scenebuilder/Library'
+    }
 }
 
 task removeBnd(type: Delete) {

+ 1 - 1
materialfx/gradle.properties

@@ -1,6 +1,6 @@
 GROUP=io.github.palexdev
 POM_ARTIFACT_ID=materialfx
-VERSION_NAME=11.10.1
+VERSION_NAME=11.11.0
 
 POM_NAME=materialfx
 POM_DESCRIPTION=Material Desgin components for JavaFX