diff --git a/build.gradle b/build.gradle index a305f17a..1dad0698 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ repositories { maven { url "https://jitpack.io" } } -version = '0.6.0-alpha3' +version = '0.6.0-alpha4' //Java 19 is required for this version of the Project Panama preview/incubator feature java { @@ -206,13 +206,13 @@ String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-19.0.1-full' /** * Download URLs to download the JDK as part of the gradle build packaging process */ -String jdk_download_base = 'https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-' -String jdk_download_suffix = '-full.tar.gz' -String jdk_download_linux_aarch64 = jdk_download_base + 'linux-aarch64' + jdk_download_suffix -String jdk_download_linux_x86_64 = jdk_download_base + 'linux-amd64' + jdk_download_suffix -String jdk_download_osx_x86_64 = jdk_download_base + 'macos-aarch64' + jdk_download_suffix -String jdk_download_osx_aarch64 = jdk_download_base + 'macos-amd64' + jdk_download_suffix -String jdk_download_windows_x86_64 = jdk_download_base + 'windows-amd64-full.zip' +def jdk_download_base = "https://download.bell-sw.com/java/19.0.1+11/bellsoft-jdk19.0.1+11-" +def jdk_download_suffix = "-full.tar.gz" +def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix +def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix +def jdk_download_osx_x86_64 = jdk_download_base + "macos-aarch64" + jdk_download_suffix +def jdk_download_osx_aarch64 = jdk_download_base + "macos-amd64" + jdk_download_suffix +def jdk_download_windows_x86_64 = jdk_download_base + "windows-amd64-full.zip" /** * Configures the runtime zip task with additional options/settings. @@ -294,7 +294,9 @@ tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt -> rt.extension.targetPlatform(targetWindowsX86_64, jdk_windows_x86_64, []) } else { - rt.extension.targetPlatform(targetWindowsX86_64, jdkDownload(jdk_download_windows_x86_64)) + rt.extension.targetPlatform(targetWindowsX86_64) { + jdkHome = jdkDownload(jdk_download_windows_x86_64) + } } configure(rt, jvmArgsWindows) @@ -315,28 +317,36 @@ tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt -> rt.extension.targetPlatform(targetLinuxAarch64, jdk_linux_aarch64, []) } else { - rt.extension.targetPlatform(targetLinuxAarch64, jdkDownload(jdk_download_linux_aarch64)) + rt.extension.targetPlatform(targetLinuxAarch64) { + jdkHome = jdkDownload(jdk_download_linux_aarch64) + } } //Linux x86-64 if(file(jdk_linux_x86_64).exists()) { rt.extension.targetPlatform(targetLinuxX86_64, jdk_linux_x86_64, []) } else { - rt.extension.targetPlatform(targetLinuxX86_64, jdkDownload(jdk_download_linux_x86_64)) + rt.extension.targetPlatform(targetLinuxX86_64) { + jdkHome = jdkDownload(jdk_download_linux_x86_64) + } } //OSX aarch64 if(file(jdk_osx_aarch64).exists()) { rt.extension.targetPlatform(targetOsxAarch64, jdk_osx_aarch64, []) } else { - rt.extension.targetPlatform(targetOsxAarch64, jdkDownload(jdk_download_osx_aarch64)) + rt.extension.targetPlatform(targetOsxAarch64) { + jdkHome = jdkDownload(jdk_download_osx_aarch64) + } } //Linux x86-64 if(file(jdk_osx_x86_64).exists()) { rt.extension.targetPlatform(targetOsxX86_64, jdk_osx_x86_64, []) } else { - rt.extension.targetPlatform(targetOsxX86_64, jdkDownload(jdk_download_osx_x86_64)) + rt.extension.targetPlatform(targetOsxX86_64) { + jdkHome = jdkDownload(jdk_download_osx_x86_64) + } } configure(rt, jvmArgsLinux); diff --git a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java index 70a82569..f6796d5e 100644 --- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java +++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/PolyphaseChannelSource.java @@ -28,11 +28,12 @@ import io.github.dsheirer.source.SourceEvent; import io.github.dsheirer.source.tuner.channel.StreamProcessorWithHeartbeat; import io.github.dsheirer.source.tuner.channel.TunerChannel; import io.github.dsheirer.source.tuner.channel.TunerChannelSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Polyphase Channelizer's Tuner Channel Source implementation. Wraps a ChannelOutputProcessor instance and @@ -201,6 +202,7 @@ public class PolyphaseChannelSource extends TunerChannelSource implements Listen if(mPolyphaseChannelOutputProcessor != null) { mPolyphaseChannelOutputProcessor.setListener(null); + mPolyphaseChannelOutputProcessor.stop(); } mPolyphaseChannelOutputProcessor = null;