Compare commits

..

No commits in common. "main" and "properties" have entirely different histories.

10 changed files with 49 additions and 28 deletions

View file

@ -7,14 +7,21 @@ type: docker
# os: linux # os: linux
# arch: amd64 # arch: amd64
steps: steps:
# - name: test
# image: docker.io/bellsoft/liberica-openjdk-debian:17
# commands:
# - ./gradlew --quiet --no-daemon test
- name: jpackage - name: jpackage
image: docker.io/eclipse-temurin:17 image: docker.io/debian:stable
environment: environment:
AUTH_TOKEN: # Gitea access token ENV variable AUTH_TOKEN: # Gitea access token ENV variable
from_secret: AUTH_TOKEN # Name of DroneCI secret exposed above from_secret: AUTH_TOKEN # Name of DroneCI secret exposed above
commands: commands:
- apt-get update && apt-get install -y dpkg-dev rpm unzip zip curl - apt-get update && apt-get install -y dpkg-dev rpm unzip zip curl openjdk-17-jdk
- ./gradlew --no-daemon clean build jpackage - ./gradlew --no-daemon clean build jpackage
- for file in build/jpackage/*.* ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done - for file in build/jpackage/*.* ; do curl -s --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
when: when:

View file

@ -1,4 +0,0 @@
FROM docker.io/eclipse-temurin:17 AS build
COPY . .
RUN apt update && apt install -y dpkg-dev rpm
RUN ./gradlew clean build jpackage

View file

@ -1,3 +1,37 @@
# Repository moved # mDNS Explorer
Please visit [github.com/mnellemann/mdns-explorer](https://github.com/mnellemann/mdns-explorer) View multicastDNS services on your local network.
![mDNS-Explorer](doc/mDNS-Explorer.png)
## Development
Java SDK version 17 (or later) is required.
Information on how to build and package jftpd:
```shell
./gradlew build jpackage
```
### Windows
Download and install
- Microsoft .NET Framework 3.5
- Wix Toolset 3.11.2 (or later)
### Linux
TODO
docker build . -f docker/Dockerfile.rpm-txt
or
docker build . -f docker/Dockerfile.deb-txt
### MacOS
TODO

View file

@ -5,7 +5,6 @@ plugins {
id 'org.openjfx.javafxplugin' version '0.0.14' id 'org.openjfx.javafxplugin' version '0.0.14'
id 'com.google.osdetector' version '1.7.3' id 'com.google.osdetector' version '1.7.3'
id 'org.beryx.jlink' version '2.26.0' id 'org.beryx.jlink' version '2.26.0'
id "com.github.ben-manes.versions" version "0.47.0"
} }
repositories { repositories {
@ -41,12 +40,10 @@ dependencies {
implementation 'org.slf4j:slf4j-api:2.0.7' // Logging API implementation 'org.slf4j:slf4j-api:2.0.7' // Logging API
runtimeOnly 'org.slf4j:slf4j-simple:2.0.7' // Logging API runtimeOnly 'org.slf4j:slf4j-simple:2.0.7' // Logging API
implementation 'io.github.mkpaz:atlantafx-base:2.0.1'
implementation 'jakarta.inject:jakarta.inject-api:2.0.1' implementation 'jakarta.inject:jakarta.inject-api:2.0.1'
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
implementation 'org.jmdns:jmdns:3.5.8' implementation 'org.jmdns:jmdns:3.5.8'
testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0' testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
testImplementation 'org.slf4j:slf4j-simple:2.0.7' testImplementation 'org.slf4j:slf4j-simple:2.0.7'
} }
@ -82,7 +79,6 @@ jlink {
'--copyright', 'Mark Nellemann <mark.nellemann@gmail.com>', '--copyright', 'Mark Nellemann <mark.nellemann@gmail.com>',
'--app-version', project.findProperty('version') '--app-version', project.findProperty('version')
] ]
icon = 'src/main/resources/icon.png'
// Requires: https://wixtoolset.org/ to create installer on Windows // Requires: https://wixtoolset.org/ to create installer on Windows
if(osdetector.os == 'windows') { if(osdetector.os == 'windows') {
@ -120,10 +116,3 @@ jlink {
} }
} }
// https://github.com/ben-manes/gradle-versions-plugin
tasks.named("dependencyUpdates").configure {
rejectVersionIf {
isNonStable(it.candidate.version)
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 87 KiB

View file

@ -1 +1 @@
version = 1.0.2 version = 1.0.1

View file

@ -6,7 +6,6 @@ import javafx.fxml.FXMLLoader;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.stage.Stage; import javafx.stage.Stage;
import atlantafx.base.theme.NordDark;
import java.awt.Taskbar; import java.awt.Taskbar;
import java.awt.Toolkit; import java.awt.Toolkit;
@ -41,9 +40,6 @@ public class App extends Application {
} }
// find more themes in 'atlantafx.base.theme' package
Application.setUserAgentStylesheet(new NordDark().getUserAgentStylesheet());
FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource("main.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource("main.fxml"));
Scene scene = new Scene(fxmlLoader.load()); Scene scene = new Scene(fxmlLoader.load());
primaryStage.setTitle("mDNS Explorer"); primaryStage.setTitle("mDNS Explorer");

View file

@ -43,7 +43,7 @@ public class NetworkServiceListener implements ServiceListener {
log.info("serviceRemoved() - Service: " + name); log.info("serviceRemoved() - Service: " + name);
Platform.runLater( () -> { Platform.runLater( () -> {
observableList.stream().filter(e -> ( observableList.stream().filter(e -> (
e.getName().equals(name) e.getName().equals(name) && e.getUrl().equals(url)
)).forEach(observableList::remove); )).forEach(observableList::remove);
}); });
} }

View file

@ -1,12 +1,11 @@
module biz.nellemann.mdexpl { module biz.nellemann.mdexpl {
requires javafx.controls; requires javafx.controls;
requires javafx.fxml; requires javafx.fxml;
requires java.desktop;
requires javax.jmdns; requires javax.jmdns;
requires org.slf4j; requires org.slf4j;
requires jakarta.inject; requires jakarta.inject;
requires jakarta.annotation; requires jakarta.annotation;
requires atlantafx.base; requires java.desktop;
opens biz.nellemann.mdexpl to javafx.fxml; opens biz.nellemann.mdexpl to javafx.fxml;
exports biz.nellemann.mdexpl; exports biz.nellemann.mdexpl;

View file

@ -9,7 +9,7 @@
<ListView fx:id="listView" BorderPane.alignment="CENTER" /> <ListView fx:id="listView" BorderPane.alignment="CENTER" />
</center> </center>
<right> <right>
<ListView fx:id="propertiesList" maxWidth="1.7976931348623157E308" prefWidth="360.0" /> <ListView fx:id="propertiesList" />
</right> </right>
</BorderPane> </BorderPane>