Skip to content

Commit

Permalink
Merge pull request #625 from dlsc-software-consulting-gmbh/develop
Browse files Browse the repository at this point in the history
New mobile client.
  • Loading branch information
dlemmermann authored Jul 9, 2024
2 parents 7a4e963 + 1bfdb3e commit 575095a
Show file tree
Hide file tree
Showing 148 changed files with 9,640 additions and 1,839 deletions.
16 changes: 16 additions & 0 deletions .launchers/JFXCentral2MobileApp (develop).run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="JFXCentral2MobileApp (develop)" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="com.dlsc.jfxcentral2.app.JFXCentral2MobileApp" />
<module name="app" />
<option name="VM_PARAMETERS" value="-Ddevelop=true -Dsocial=false" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dlsc.jfxcentral2.app.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
15 changes: 15 additions & 0 deletions .launchers/JFXCentral2MobileApp.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="JFXCentral2MobileApp" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="com.dlsc.jfxcentral2.app.JFXCentral2MobileApp" />
<module name="app" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dlsc.jfxcentral2.app.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
18 changes: 17 additions & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
33 changes: 5 additions & 28 deletions app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<gluonfx.plugin.version>1.0.21</gluonfx.plugin.version>
<gluonfx.plugin.version>1.0.22</gluonfx.plugin.version>
<javafx.plugin.version>0.0.8</javafx.plugin.version>
<mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2App</mainClassName>
<mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2MobileApp</mainClassName>
<app.description>JFXCentral for anything JavaFX</app.description>
<package.type/>
<mac.app.store/>
Expand All @@ -45,7 +45,6 @@
</dependency>
-->

<!--
<dependency>
<groupId>com.gluonhq.attachextended</groupId>
<artifactId>yt</artifactId>
Expand All @@ -59,7 +58,6 @@
<scope>runtime</scope>
<classifier>${attach.extended.classifier}</classifier>
</dependency>
-->

<dependency>
<groupId>org.openjfx</groupId>
Expand All @@ -71,11 +69,6 @@
<artifactId>FXTrayIcon</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>com.dlsc.jfxcentral2</groupId>
<artifactId>iconfont</artifactId>
Expand All @@ -89,25 +82,21 @@
<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-routing-core</artifactId>
<version>${jpro.platform.version}</version>
</dependency>

<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>jpro-routing-dev</artifactId>
<version>${jpro.platform.version}</version>
</dependency>

<dependency>
<groupId>one.jpro.platform</groupId>
<artifactId>freeze-detector</artifactId>
<version>${jpro.platform.version}</version>
<groupId>com.dlsc.jfxcentral2</groupId>
<artifactId>components</artifactId>
</dependency>

<dependency>
<groupId>com.dlsc.jfxcentral2</groupId>
<artifactId>components</artifactId>
<version>1.0-SNAPSHOT</version>
<artifactId>mobile</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -425,14 +414,6 @@
<artifactId>ikonli-zondicons-pack</artifactId>
</dependency>

<!--
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>2.20.0</version>
</dependency>
-->

</dependencies>

<pluginRepositories>
Expand All @@ -457,9 +438,6 @@
<version>${javafx.plugin.version}</version>
<configuration>
<mainClass>${mainClassName}</mainClass>
<options>
<!--<option>-Ddevelop=true</option>-->
</options>
</configuration>
</plugin>

Expand Down Expand Up @@ -512,7 +490,6 @@
<releaseName>jfxcentral</releaseName>
<localJVMArgs>-Ddevelop=false</localJVMArgs>
<port>8088</port>
<javafxVersion>22</javafxVersion>
</configuration>
</plugin>

Expand Down
Loading

0 comments on commit 575095a

Please sign in to comment.