diff --git a/.drone.yml b/.drone.yml index 4446e82..cf9ffc4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,12 +32,12 @@ steps: - tag - name: build-rpm - image: docker.io/almalinux:8 + image: docker.io/almalinux:9 environment: AUTH_TOKEN: # Gitea access token ENV variable from_secret: AUTH_TOKEN # Name of DroneCI secret exposed above commands: - - dnf -y install unzip zip curl rpm-build java-17-openjdk-gui + - dnf -y install unzip zip curl rpm-build java-17-openjdk # - bash -c "curl -s 'https://get.sdkman.io' | bash" # - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk install java 17.0.8.fx-librca" # - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && ./gradlew --no-daemon clean build jpackage" diff --git a/build.gradle b/build.gradle index 3ad5d0e..dcaf8a9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,6 @@ plugins { id 'org.openjfx.javafxplugin' version '0.0.14' id 'com.google.osdetector' version '1.7.3' id 'org.beryx.jlink' version '2.26.0' - //id "com.github.johnrengelman.shadow" version "8.1.1" - //id 'com.gluonhq.gluonfx-gradle-plugin' version '1.0.19' - } @@ -30,7 +27,9 @@ application { java { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 - //modularity.inferModulePath = false + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } /* This is to be able to build with a JDK not bundled with JavaFX */ @@ -56,56 +55,6 @@ test { useJUnitPlatform() } -/* -gluonfx { - verbose = true - target = project.hasProperty("target") ? project.getProperty("target") : 'host' - //target = 'ios' // Uncomment to enable iOS - see https://docs.gluonhq.com/#prerequisites_ios - //target = 'android' // Uncomment to enable Android - see https://docs.gluonhq.com/#prerequisites_android - - attachConfig { - version = "4.0.18" - services 'storage', 'display', 'lifecycle', 'statusbar' - } - - reflectionList = [ - "javafx.fxml.FXMLLoader", - "com.gluonhq.charm.glisten.mvc.View", - "com.gluonhq.charm.glisten.control.Icon", - "com.gluonhq.charm.glisten.control.DropdownButton", - "com.gluonhq.charm.glisten.control.BottomNavigation", - "com.gluonhq.charm.glisten.control.BottomNavigationButton", - "biz.nellemann.mdexpl.view.AboutPresenter", - "biz.nellemann.mdexpl.view.MainPresenter", "biz.nellemann.mdexpl.model.MainModel", - "biz.nellemann.mdexpl.service.DiscoveryService", - ] - - compilerArgs = [ - '-Djava.awt.headless=true' - ] - - appIdentifier = 'biz.nellemann.mdexpl' - - release { - // Android - appLabel = "mDNS Explorer" - //versionCode = "1" - //versionName = "1.0" - //providedKeyStorePath = "" - //providedKeyStorePassword = "" - //providedKeyAlias = "" - //providedKeyAliasPassword = "" - // iOS - //bundleName = "mDNS Explorer" - //bundleVersion = "" - //bundleShortVersion = "" - //providedSigningIdentity = "" - //providedProvisioningProfile = "" - //skipSigning = true // Will not run or deploy if not signed - } - -}*/ - jlink { forceMerge 'slf4j' @@ -184,15 +133,6 @@ jlink { } -/* -shadowJar { - //archiveBaseName.set("vtd-poc-app") - //archiveClassifier.set('all') - archiveVersion.set("${System.env.BITBUCKET_BRANCH ?: 'dev' }") -}*/ - -//tasks.build.dependsOn tasks.shadowJar - tasks.processResources { filesMatching('**/configuration.properties') { filter(ReplaceTokens, tokens: [copyright: '2023', version: System.env.BITBUCKET_BUILD_NUMBER ?: 'development' ]) diff --git a/doc/mDNS-Explorer.png b/doc/mDNS-Explorer.png new file mode 100644 index 0000000..6a0d9a9 Binary files /dev/null and b/doc/mDNS-Explorer.png differ