Merge remote-tracking branch 'origin/main'

This commit is contained in:
JonathanFleischmann 2024-04-24 15:28:55 +02:00
commit 0e7cafbcea
2 changed files with 83 additions and 12 deletions

38
.idea/workspace.xml generated
View File

@ -4,16 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="534a833a-fe3f-476c-8d82-46f799af4d01" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/CompilerUltimate/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CompilerUltimate/.idea/encodings.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CompilerUltimate/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CompilerUltimate/.idea/vcs.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CompilerUltimate/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CompilerUltimate/pom.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/CompilerUltimate/src/main/java/de/maishai/Main.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<list default="true" id="534a833a-fe3f-476c-8d82-46f799af4d01" name="Changes" comment="add empty java project">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -25,16 +18,23 @@
<option name="ROOT_SYNC" value="DONT_SYNC" />
</component>
<component name="ProjectId" id="2fY1r8tMxPX2dVLK0Ta4KMNRQ14" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ASKED_ADD_EXTERNAL_FILES": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "main",
"kotlin-language-version-configured": "true",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
}
@ -55,11 +55,25 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1713963398904</updated>
<workItem from="1713963400263" duration="12000" />
<workItem from="1713963400263" duration="1430000" />
</task>
<task id="LOCAL-00001" summary="add empty java project">
<option name="closed" value="true" />
<created>1713963500367</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1713963500367</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="add empty java project" />
<option name="LAST_COMMIT_MESSAGE" value="add empty java project" />
</component>
</project>

57
pom.xml
View File

@ -14,4 +14,61 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- ASM -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.7</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>9.7</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>9.7</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>9.7</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>9.7</version>
</dependency>
<!-- ASM end -->
<!-- ANTLR -->
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
<version>4.13.1</version>
</dependency>
<!-- ANTLR end -->
</dependencies>
<build>
<finalName>compilerUltimate</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<manifest>
<mainClass>de.maishai.Main</mainClass>
</manifest>
</archive>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</project>