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

Merge pull request #614 from itshanney/bugfix/remove-guice-warnings

Browse Source 
Update guice library to remove AOP; Fixes issue #609
This commit is contained in:
Daniel Williams 2020-04-06 21:45:55 -04:00 committed by GitHub
commit 7745563c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/artifacts/openrocket_jar.xml generated
View File

@ -31,7 +31,7 @@
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-amd64.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-amd64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-i586.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-windows-i586.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/annotation-detector-3.0.5.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/annotation-detector-3.0.5.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guice-4.2.1.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guice-4.2.3-no_aop.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guava-26.0-jre.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guava-26.0-jre.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/opencsv-4.3.2.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/opencsv-4.3.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/slf4j-api-1.7.30.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/core/lib/slf4j-api-1.7.30.jar" path-in-jar="/" />

2
core/.classpath
View File

@ -19,7 +19,7 @@
<classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/> <classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="lib/annotation-detector-3.0.5.jar"/> <classpathentry kind="lib" path="lib/annotation-detector-3.0.5.jar"/>
<classpathentry kind="lib" path="lib/guice-4.2.1.jar"/> <classpathentry kind="lib" path="lib/guice-4.2.3-no_aop.jar"/>
<classpathentry kind="lib" path="lib/logback-classic-1.2.3.jar"/> <classpathentry kind="lib" path="lib/logback-classic-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/logback-core-1.2.3.jar"/> <classpathentry kind="lib" path="lib/logback-core-1.2.3.jar"/>
<classpathentry kind="lib" path="lib/opencsv-4.3.2.jar"/> <classpathentry kind="lib" path="lib/opencsv-4.3.2.jar"/>

2
core/OpenRocket Core.iml
View File

@ -128,7 +128,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/lib/guice-4.2.1.jar!/" /> <root url="jar://$MODULE_DIR$/lib/guice-4.2.3-no_aop.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

BIN
core/lib/guice-4.2.1.jar
View File

Binary file not shown.

BIN
core/lib/guice-4.2.3-no_aop.jar Normal file
View File

Binary file not shown.

2
swing/.classpath
View File

@ -22,7 +22,7 @@
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/> <classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.5.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.5.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/guice-4.2.1.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/guice-4.2.3-no_aop.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/logback-classic-1.2.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Core/lib/logback-core-1.2.3.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/> <classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.jar"/>

18
swing/OpenRocket Swing.iml
View File

@ -172,15 +172,6 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/guice-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
@ -245,5 +236,14 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/guice-4.2.3-no_aop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

2
swing/build.xml
View File

@ -93,7 +93,7 @@
<zipfileset src="${core.dir}/build/jar/OpenRocket-Core.jar" /> <zipfileset src="${core.dir}/build/jar/OpenRocket-Core.jar" />
<zipfileset src="${lib.dir}/miglayout-4.0-swing.jar" /> <zipfileset src="${lib.dir}/miglayout-4.0-swing.jar" />
<zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" /> <zipfileset src="${core.dir}/lib/guava-26.0-jre.jar" />
<zipfileset src="${core.dir}/lib/guice-4.2.1.jar" /> <zipfileset src="${core.dir}/lib/guice-4.2.3-no_aop.jar" />
<zipfileset src="${core.dir}/lib/aopalliance.jar"/> <zipfileset src="${core.dir}/lib/aopalliance.jar"/>
<zipfileset src="${core.dir}/lib/script-api-1.0.jar"/> <zipfileset src="${core.dir}/lib/script-api-1.0.jar"/>
<zipfileset src="${lib.dir}/iText-5.0.2.jar"/> <zipfileset src="${lib.dir}/iText-5.0.2.jar"/>