mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
Updates gradle wrapper to use version 7.2 and updates build script for 7.2 compatibility.
This commit is contained in:
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="liberica-16 (2)" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="azul-17 (2)" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
50
build.gradle
50
build.gradle
@@ -23,8 +23,8 @@ plugins {
|
|||||||
id 'application'
|
id 'application'
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'idea'
|
id 'idea'
|
||||||
id 'org.openjfx.javafxplugin' version '0.0.8'
|
id 'org.openjfx.javafxplugin' version '0.0.10'
|
||||||
id 'org.beryx.runtime' version '1.11.4'
|
id 'org.beryx.runtime' version '1.12.7'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -33,8 +33,8 @@ repositories {
|
|||||||
maven { url "https://jitpack.io" }
|
maven { url "https://jitpack.io" }
|
||||||
}
|
}
|
||||||
|
|
||||||
version = '0.5.0-alpha6'
|
version = '0.5.0-alpha7'
|
||||||
sourceCompatibility = '13'
|
sourceCompatibility = '17'
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main.java.srcDirs 'src/main'
|
main.java.srcDirs 'src/main'
|
||||||
@@ -82,7 +82,7 @@ dependencies {
|
|||||||
implementation 'org.apache.commons:commons-math3:3.6.1'
|
implementation 'org.apache.commons:commons-math3:3.6.1'
|
||||||
implementation 'org.apache.mina:mina-core:2.1.3'
|
implementation 'org.apache.mina:mina-core:2.1.3'
|
||||||
implementation 'org.apache.mina:mina-http:2.1.3'
|
implementation 'org.apache.mina:mina-http:2.1.3'
|
||||||
implementation 'org.controlsfx:controlsfx:11.0.2'
|
implementation 'org.controlsfx:controlsfx:11.1.0'
|
||||||
implementation 'org.rauschig:jarchivelib:1.0.0'
|
implementation 'org.rauschig:jarchivelib:1.0.0'
|
||||||
|
|
||||||
implementation 'org.slf4j:slf4j-api:1.7.25'
|
implementation 'org.slf4j:slf4j-api:1.7.25'
|
||||||
@@ -90,20 +90,6 @@ dependencies {
|
|||||||
implementation 'org.usb4java:usb4java:1.3.0'
|
implementation 'org.usb4java:usb4java:1.3.0'
|
||||||
implementation 'org.usb4java:usb4java-javax:1.3.0'
|
implementation 'org.usb4java:usb4java-javax:1.3.0'
|
||||||
implementation 'pl.edu.icm:JLargeArrays:1.6'
|
implementation 'pl.edu.icm:JLargeArrays:1.6'
|
||||||
|
|
||||||
//These must remain as compile options to ensure they are included in the build to produce multi-OS images
|
|
||||||
compileOnly "org.openjfx:javafx-base:15:win"
|
|
||||||
compileOnly "org.openjfx:javafx-base:15:linux"
|
|
||||||
compileOnly "org.openjfx:javafx-base:15:mac"
|
|
||||||
compileOnly "org.openjfx:javafx-controls:15:win"
|
|
||||||
compileOnly "org.openjfx:javafx-controls:15:linux"
|
|
||||||
compileOnly "org.openjfx:javafx-controls:15:mac"
|
|
||||||
compileOnly "org.openjfx:javafx-graphics:15:win"
|
|
||||||
compileOnly "org.openjfx:javafx-graphics:15:linux"
|
|
||||||
compileOnly "org.openjfx:javafx-graphics:15:mac"
|
|
||||||
compileOnly "org.openjfx:javafx-swing:15:win"
|
|
||||||
compileOnly "org.openjfx:javafx-swing:15:linux"
|
|
||||||
compileOnly "org.openjfx:javafx-swing:15:mac"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
application {
|
application {
|
||||||
@@ -118,8 +104,14 @@ idea {
|
|||||||
}
|
}
|
||||||
|
|
||||||
javafx {
|
javafx {
|
||||||
version = "15"
|
version = "17.0.1"
|
||||||
modules = ['javafx.base', 'javafx.controls', 'javafx.graphics', 'javafx.swing']
|
modules = ['javafx.base', 'javafx.controls', 'javafx.graphics', 'javafx.swing']
|
||||||
|
configuration = "implementation"
|
||||||
|
}
|
||||||
|
|
||||||
|
run {
|
||||||
|
// jvmArgs = ['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED']
|
||||||
|
jvmArgs = ['--add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls']
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
@@ -136,17 +128,17 @@ jar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Java Development Kit (JDK) locations. In order to build OS-specific images, these paths must point to the 'bin'
|
* Java Development Kit (JDK) locations. In order to build OS-specific images, these paths must point to the parent
|
||||||
* directory within a JDK for each of the specified architectures. These JDKs are used by the runtime and runtimeZip
|
* directory containing the 'bin' directory within a JDK for each of the specified architectures. These JDKs are used
|
||||||
* tasks to produce platform-specific builds. If none of these paths exists, then an image will be created for the
|
* by the runtime and runtimeZip tasks to produce platform-specific builds. If none of these paths exists, then an
|
||||||
* host OS using the installed JDK.
|
* image will be created for the host OS using the installed JDK.
|
||||||
*/
|
*/
|
||||||
def jdk_base = '/media/denny/WD250GB/java/bellsoft/'
|
def jdk_base = '/home/denny/java_jdks/'
|
||||||
|
|
||||||
def jdk_linux_arm64 = jdk_base + 'linux-arm64/jdk-15'
|
def jdk_linux_arm64 = jdk_base + 'linux-arm64/jdk-17.0.1-full'
|
||||||
def jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-15'
|
def jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-17.0.1-full'
|
||||||
def jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-15.jdk'
|
def jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-17.0.1-full.jdk'
|
||||||
def jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-15'
|
def jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-17.0.1-full'
|
||||||
|
|
||||||
def file_jdk_linux_arm64 = new File(jdk_linux_arm64)
|
def file_jdk_linux_arm64 = new File(jdk_linux_arm64)
|
||||||
def file_jdk_linux_x86_64 = new File(jdk_linux_x86_64)
|
def file_jdk_linux_x86_64 = new File(jdk_linux_x86_64)
|
||||||
|
|||||||
@@ -24,9 +24,7 @@ public class NamingThreadFactory implements ThreadFactory
|
|||||||
|
|
||||||
public NamingThreadFactory( String prefix )
|
public NamingThreadFactory( String prefix )
|
||||||
{
|
{
|
||||||
SecurityManager s = System.getSecurityManager();
|
mThreadGroup = Thread.currentThread().getThreadGroup();
|
||||||
|
|
||||||
mThreadGroup = (s != null)? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
|
|
||||||
|
|
||||||
mNamePrefix = prefix + " pool-" + mPoolNumber.getAndIncrement() + "-thread-";
|
mNamePrefix = prefix + " pool-" + mPoolNumber.getAndIncrement() + "-thread-";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user