Updates next version to 0.4.0 beta 1.

DSheirer · Feb 17, 2019 · d5b802e · d5b802e
1 parent 139227e
commit d5b802e
Showing 1 changed file with 40 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ repositories {
     mavenCentral()
 }
 
-version = '0.4.0-alpha.9'
+version = '0.4.0-beta.1'
 sourceCompatibility = '11'
 
 sourceSets {
@@ -64,15 +64,15 @@ dependencies {
     compile "org.openjfx:javafx-base:11:win"
     compile "org.openjfx:javafx-base:11:linux"
     compile "org.openjfx:javafx-base:11:mac"
-    compile "org.openjfx:javafx-controls:11:win"
-    compile "org.openjfx:javafx-controls:11:linux"
-    compile "org.openjfx:javafx-controls:11:mac"
-    compile "org.openjfx:javafx-graphics:11:win"
-    compile "org.openjfx:javafx-graphics:11:linux"
-    compile "org.openjfx:javafx-graphics:11:mac"
-    compile "org.openjfx:javafx-swing:11:win"
-    compile "org.openjfx:javafx-swing:11:linux"
-    compile "org.openjfx:javafx-swing:11:mac"
+    compile "org.openjfx:javafx-controls:11.0.2:win"
+    compile "org.openjfx:javafx-controls:11.0.2:linux"
+    compile "org.openjfx:javafx-controls:11.0.2:mac"
+    compile "org.openjfx:javafx-graphics:11.0.2:win"
+    compile "org.openjfx:javafx-graphics:11.0.2:linux"
+    compile "org.openjfx:javafx-graphics:11.0.2:mac"
+    compile "org.openjfx:javafx-swing:11.0.2:win"
+    compile "org.openjfx:javafx-swing:11.0.2:linux"
+    compile "org.openjfx:javafx-swing:11.0.2:mac"
     compile 'org.slf4j:slf4j-api:1.7.25'
     compile 'org.usb4java:libusb4java:1.3.0'
     compile 'org.usb4java:usb4java:1.3.0'
@@ -112,16 +112,19 @@ task buildSdr(type: Jar) {
  * within a JDK for each of the specified architectures.  These JDKs are used by the 
  * runtime and runtimeZip tasks to produce platform-specific builds
  */
-def jdkLinux_aarch64 = '/media/denny/WD250GB/java/bellsoft/linux-aarch64/jdk-11.0.2'
 def jdkLinux_x64 = '/media/denny/WD250GB/java/bellsoft/linux-x64/jdk-11.0.2'
 def jdkOsx_x64 = '/media/denny/WD250GB/java/bellsoft/osx-x64/jdk-11.0.2.jdk'
 def jdkWindows_x64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-11.0.2'
+//def jdkLinux_aarch64 = '/media/denny/WD250GB/java/bellsoft/linux-aarch64/jdk-11.0.2'
+//def jdkLinux_arm32 = '/media/denny/WD250GB/java/bellsoft/linux-arm32/jdk-11.0.2'
+//def jfxLinux_arm32 = '/media/denny/WD250GB/java/bellsoft/linux-arm32/armv6hf-sdk/lib'
 
 runtime {
-    targetPlatform('linux-aarch64', jdkLinux_aarch64)
     targetPlatform('linux-x64', jdkLinux_x64)
     targetPlatform('osx-x64', jdkOsx_x64)
     targetPlatform('windows-x64', jdkWindows_x64)
+//    targetPlatform('linux-aarch64', jdkLinux_aarch64)
+//    targetPlatform('linux-arm32', jdkLinux_arm32)
 
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
     modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop']
@@ -132,15 +135,6 @@ runtime {
  * Check for existence of JDK folders for each supported platform before creating runtime images
  */
 tasks.runtime.doFirst {
-    def linux_aarch64 = new File(jdkLinux_aarch64)
-
-    if(!linux_aarch64.exists())
-    {
-        println("Linux aarch64 JDK was not found at " + jdkLinux_aarch64)
-        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-aarch64 architecture.  " +
-                "Please update the build.gradle script to provide the correct path")
-    }
-
     def linux_x64 = new File(jdkLinux_x64)
 
     if(!linux_x64.exists())
@@ -167,16 +161,39 @@ tasks.runtime.doFirst {
         throw new GradleException("Cannot find Java Development Kit (JDK) for windows-x64 architecture.  " +
                 "Please update the build.gradle script to provide the correct path")
     }
+
+//    def linux_aarch64 = new File(jdkLinux_aarch64)
+//
+//    if(!linux_aarch64.exists())
+//    {
+//        println("Linux aarch64 JDK was not found at " + jdkLinux_aarch64)
+//        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-aarch64 architecture.  " +
+//                "Please update the build.gradle script to provide the correct path")
+//    }
+//
+//    def linux_arm32 = new File(jdkLinux_arm32)
+//
+//    if(!linux_arm32.exists())
+//    {
+//        println("Linux arm32 JDK was not found at " + jdkLinux_arm32)
+//        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-arm32 architecture.  " +
+//                "Please update the build.gradle script to provide the correct path")
+//    }
 }
 
 /**
  * Since we have to list each of the platform-specific JavaFX libraries as dependencies, 
  * remove them from each build image
  */
 tasks.runtime.doLast {
-    delete(fileTree('build/image/sdr-trunk-linux-aarch64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
     delete(fileTree('build/image/sdr-trunk-linux-x64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
     delete(fileTree('build/image/sdr-trunk-osx-x64/lib').include { it.name ==~ /javafx.*-(win|linux)\.jar/ })
     delete(fileTree('build/image/sdr-trunk-windows-x64/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
-}
 
+//    delete(fileTree('build/image/sdr-trunk-linux-aarch64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
+//    delete(fileTree('build/image/sdr-trunk-linux-arm32/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
+//    copy {
+//        from(jfxLinux_arm32).exclude("src.zip")
+//        into 'build/image/sdr-trunk-linux-arm32/lib'
+//    }
+}