Skip to content

Feature/add run via maven #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Madzi wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Feature/add run via maven #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6a9388
Initial implementation
Madzi Sep 8, 2022
37e79bb
Fix #45 and #46 issues
Madzi Sep 8, 2022
be3bc11
Merge pull request #1 from Madzi/feature/45-46-rename-buttons
Madzi Sep 8, 2022
b8160de
Provide all dependencies into one jar file - fat jar
Madzi Sep 8, 2022
f3f5f1f
setup exec plugin
Madzi Sep 8, 2022
8134a18
Merge branch 'develop' into feature/add-run-via-maven
Madzi Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/mvn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: mvn
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
test:
name: Tests
strategy:
matrix:
os: [ubuntu-20.04, windows-2022, macos-12]
java: [1.8]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- run: mvn clean install --errors --batch-mode
15 changes: 12 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
*.backup
*.exe
/bitrock/*.run
/.idea/dictionaries/*.xml
/Games/*.temp
/.idea/dictionaries/mbalanov.xml
# Temporal
/Games/*.temp
# Idea
.idea/
# Maven
target/
bin/
# Eclipse
.project
.classpath
.settings/
# NetBeans
nb-configuration.xml
187 changes: 187 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>ifml2</groupId>
<artifactId>ifml2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>IFML2</name>

<properties>
<encoding>UTF-8</encoding>
<java.version>1.8</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<exec.mainClass>ifml2.Launcher</exec.mainClass>
</properties>

<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>net.java.dev.glazedlists</groupId>
<artifactId>glazedlists_java15</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>com.sun</groupId>
<artifactId>rt</artifactId>
<version>1.8</version>
<scope>system</scope>
<systemPath>${java.home}/../jre/lib/rt.jar</systemPath>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>23.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.11</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.2.11</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>forms_rt</artifactId>
<version>4.5.4</version>
</dependency>
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>unittests</testSourceDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/ifml2/editor/gui/images</directory>
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<index>true</index>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>ifml2.Launcher</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>${java.home}/bin/java</executable>
<mainClass>ifml2.Launcher</mainClass>
<arguments>
<argument>-cp</argument>
<argument>target/${project.build.finalName}-jar-with-dependencies.jar</argument>
<argument>${exec.mainClass}</argument>
</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>target/classes/ifml2/editor/gui/images</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/ifml2/editor/gui/images</directory>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</project>
3 changes: 0 additions & 3 deletions src/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/ifml2/editor/gui/ShowMemoDialog.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="OK"/>
<text value="Подтвердить"/>
</properties>
</component>
</children>
Expand Down
4 changes: 2 additions & 2 deletions src/ifml2/editor/gui/editors/ActionEditor.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="OK"/>
<text value="Подтвердить"/>
</properties>
</component>
<component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Cancel"/>
<text value="Отменить"/>
</properties>
</component>
</children>
Expand Down
4 changes: 2 additions & 2 deletions src/ifml2/editor/gui/editors/ActionsEditor.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="OK"/>
<text value="Подтвердить"/>
</properties>
</component>
<component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Cancel"/>
<text value="Отменить"/>
</properties>
</component>
</children>
Expand Down
8 changes: 4 additions & 4 deletions src/ifml2/editor/gui/editors/DictionaryEditor.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>
<xy x="48" y="54" width="476" height="316"/>
<xy x="48" y="54" width="480" height="316"/>
</constraints>
<properties>
<preferredSize width="450" height="200"/>
Expand Down Expand Up @@ -36,7 +36,7 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;OK"/>
<text value="Подтвердить"/>
</properties>
</component>
</children>
Expand Down Expand Up @@ -197,14 +197,14 @@
<constraints/>
<properties>
<icon value="ifml2/editor/gui/images/Add24.gif"/>
<text value="&amp;Новое..."/>
<text value="Новое..."/>
</properties>
</component>
<component id="e6c8d" class="javax.swing.JButton" binding="delWordButton">
<constraints/>
<properties>
<icon value="ifml2/editor/gui/images/Delete24.gif"/>
<text value="&amp;Удалить..."/>
<text value="Удалить..."/>
</properties>
</component>
</children>
Expand Down
12 changes: 6 additions & 6 deletions src/ifml2/editor/gui/editors/HookEditor.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;OK"/>
<text value="Подтвердить"/>
</properties>
</component>
<component id="5723f" class="javax.swing.JButton" binding="buttonCancel">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;Cancel"/>
<text value="Отменить"/>
</properties>
</component>
</children>
Expand Down Expand Up @@ -109,15 +109,15 @@
</constraints>
<properties>
<selected value="true"/>
<text value="д&amp;о действия"/>
<text value="до действия"/>
</properties>
</component>
<component id="3fc1" class="javax.swing.JRadioButton" binding="insteadRadio">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;вместо действия"/>
<text value="вместо действия"/>
</properties>
</component>
<component id="63e81" class="javax.swing.JRadioButton" binding="afterRadio">
Expand All @@ -126,7 +126,7 @@
</constraints>
<properties>
<selected value="false"/>
<text value="по&amp;сле действия"/>
<text value="после действия"/>
</properties>
</component>
</children>
Expand All @@ -152,7 +152,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="&amp;Редактировать инструкции..."/>
<text value="Редактировать инструкции..."/>
</properties>
</component>
<scrollpane id="2c216">
Expand Down
Loading