hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Java to Java 17

Browse Source
This commit is contained in:
SiboVG 2023-06-28 10:50:08 +02:00
parent 325b46608e
commit 82c9f4aadb
4 changed files with 94 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -47,7 +47,7 @@
# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
# User-specific stuff:
.idea/workspace.xml
#.idea/workspace.xml
.idea/tasks.xml
.idea/shelf
.idea/dictionaries

19
.idea/runConfigurations/All_tests.xml generated
View File

@ -1,25 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method>
<option name="Make" enabled="false" />
</method>
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<method v="2" />
</configuration>
</component>

90
.idea/workspace.xml generated Normal file
View File

@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AnalysisUIOptions">
<option name="ANALYZE_INJECTED_CODE" value="false" />
</component>
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="openrocket:jar" />
</artifacts-to-build>
</component>
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Interface" />
<option value="Class" />
</list>
</option>
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/core/resources/l10n/messages.properties" root0="SKIP_INSPECTION" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="RunManager" selected="Application.SwingStartup">
<configuration name="jar" type="AntRunConfiguration">
<antsettings antfile="file://$PROJECT_DIR$/build.xml" target="jar">
<property name="source" value="17" />
<property name="target" value="17" />
</antsettings>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="SwingStartup" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="ALTERNATIVE_JRE_PATH" value="17" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="net.sf.openrocket.startup.SwingStartup" />
<module name="OpenRocket Swing" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="net.sf.openrocket.startup.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Ant Target.jar" />
<item itemvalue="Application.SwingStartup" />
<item itemvalue="JAR Application.Openrocket UI Jar" />
<item itemvalue="JUnit.All tests" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.SwingStartup" />
</list>
</recent_temporary>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="2ecf826f-1227-4870-b9d4-17215cf24a1b" name="Changes" comment="Fix transition config layout" />
<created>1625095153807</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1625095153807</updated>
</component>
</project>

2
core/build.xml
View File

@ -59,7 +59,7 @@
<echo level="info">Java/JVM detail version: ${java.version}</echo>
<mkdir dir="${classes.dir}"/>
<echo level="info">Compiling main classes</echo>
<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="1.8" target="1.8"/>
<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath" includeantruntime="false" source="17" target="17"/>
</target>
<!-- Executable Eclipse-Jar-In-Jar style JAR -->