Merge pull request #556 from neilbalch/java11-upgrade
Upgrade to Java 11/Java 13 and retire Android app
Daniel Williams
GitHub
11
.idea/artifacts/openrocket_jar.xml
generated
@ -34,6 +34,17 @@
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib-extra/RXTXcomm.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/guice-multibindings-3.0.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/OrangeExtensions-1.2.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-linux-amd64.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-linux-i586.jar" path-in-jar="/" />
|
||||
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all-natives-macosx-universal.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="/" />
|
||||
</root>
|
||||
</artifact>
|
||||
</component>
|
||||
2
.idea/misc.xml
generated
@ -46,7 +46,7 @@
|
||||
</profile-state>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="Oracle JDK 11" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
9
.idea/runConfigurations/Openrocket_UI_Jar.xml
generated
@ -1,10 +1,9 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="Openrocket UI Jar" type="JarApplication" factoryName="JAR Application">
|
||||
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
||||
<configuration default="false" name="Openrocket UI Jar" type="JarApplication">
|
||||
<option name="JAR_PATH" value="build/jar/OpenRocket.jar" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" />
|
||||
<envs />
|
||||
<method>
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
|
||||
<option name="ALTERNATIVE_JRE_PATH" value="Oracle JDK 11" />
|
||||
<method v="2">
|
||||
<option name="BuildArtifacts" enabled="true">
|
||||
<artifact name="openrocket:jar" />
|
||||
</option>
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
|
||||
<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
|
||||
<classpathentry kind="output" path="bin/classes"/>
|
||||
</classpath>
|
||||
@ -1,33 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>ActionBarSherlock</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock">
|
||||
|
||||
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
|
||||
|
||||
</manifest>
|
||||
@ -1,6 +0,0 @@
|
||||
/** Automatically generated file. DO NOT MODIFY */
|
||||
package com.actionbarsherlock;
|
||||
|
||||
public final class BuildConfig {
|
||||
public final static boolean DEBUG = true;
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
# To enable ProGuard in your project, edit project.properties
|
||||
# to define the proguard.config property as described in that file.
|
||||
#
|
||||
# Add project specific ProGuard rules here.
|
||||
# By default, the flags in this file are appended to flags specified
|
||||
# in ${sdk.dir}/tools/proguard/proguard-android.txt
|
||||
# You can edit the include path and order by changing the ProGuard
|
||||
# include property in project.properties.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# Add any project specific keep options here:
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
@ -1,12 +0,0 @@
|
||||
# This file is automatically generated by Android Tools.
|
||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||
#
|
||||
# This file must be checked in Version Control Systems.
|
||||
#
|
||||
# To customize properties used by the Ant build system use,
|
||||
# "ant.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
android.library=true
|
||||
# Project target.
|
||||
target=android-15
|
||||
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed 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.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_dark"/>
|
||||
<item android:color="@color/abs__bright_foreground_holo_dark"/> <!-- not selected -->
|
||||
</selector>
|
||||
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed 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.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_light"/>
|
||||
<item android:color="@color/abs__bright_foreground_holo_light"/> <!-- not selected -->
|
||||
</selector>
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed 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.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_dark"/>
|
||||
<item android:state_window_focused="false" android:color="@color/abs__bright_foreground_holo_dark"/>
|
||||
<item android:state_pressed="true" android:color="@color/abs__bright_foreground_holo_dark"/>
|
||||
<item android:state_selected="true" android:color="@color/abs__bright_foreground_holo_dark"/>
|
||||
<item android:state_activated="true" android:color="@color/abs__bright_foreground_holo_dark"/>
|
||||
<item android:color="@color/abs__bright_foreground_holo_dark"/> <!-- not selected -->
|
||||
</selector>
|
||||
@ -1,26 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed 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.
|
||||
-->
|
||||
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false" android:color="@color/abs__bright_foreground_disabled_holo_light"/>
|
||||
<item android:state_window_focused="false" android:color="@color/abs__bright_foreground_holo_light"/>
|
||||
<item android:state_pressed="true" android:color="@color/abs__bright_foreground_holo_light"/>
|
||||
<item android:state_selected="true" android:color="@color/abs__bright_foreground_holo_light"/>
|
||||
<item android:state_activated="true" android:color="@color/abs__bright_foreground_holo_light"/>
|
||||
<item android:color="@color/abs__bright_foreground_holo_light"/> <!-- not selected -->
|
||||
|
||||
</selector>
|
||||
|
||||
|
Before Width: | Height: | Size: 144 B |
|
Before Width: | Height: | Size: 138 B |
|
Before Width: | Height: | Size: 144 B |
|
Before Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 134 B |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 155 B |
|
Before Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 104 B |
|
Before Width: | Height: | Size: 102 B |
|
Before Width: | Height: | Size: 112 B |
|
Before Width: | Height: | Size: 108 B |
|
Before Width: | Height: | Size: 110 B |
|
Before Width: | Height: | Size: 108 B |
|
Before Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 602 B |
|
Before Width: | Height: | Size: 546 B |
|
Before Width: | Height: | Size: 713 B |
|
Before Width: | Height: | Size: 737 B |
|
Before Width: | Height: | Size: 144 B |
|
Before Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 467 B |
|
Before Width: | Height: | Size: 505 B |
|
Before Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 78 B |
|
Before Width: | Height: | Size: 76 B |
|
Before Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 159 B |
|
Before Width: | Height: | Size: 189 B |
|
Before Width: | Height: | Size: 189 B |
|
Before Width: | Height: | Size: 922 B |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 178 B |
|
Before Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 917 B |
|
Before Width: | Height: | Size: 917 B |
|
Before Width: | Height: | Size: 188 B |
|
Before Width: | Height: | Size: 188 B |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 311 B |
|
Before Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 306 B |
|
Before Width: | Height: | Size: 306 B |
|
Before Width: | Height: | Size: 524 B |
|
Before Width: | Height: | Size: 523 B |
|
Before Width: | Height: | Size: 464 B |
|
Before Width: | Height: | Size: 458 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 145 B |
|
Before Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 134 B |
|
Before Width: | Height: | Size: 129 B |
|
Before Width: | Height: | Size: 134 B |
|
Before Width: | Height: | Size: 123 B |
|
Before Width: | Height: | Size: 123 B |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 122 B |
|
Before Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 168 B |
|
Before Width: | Height: | Size: 134 B |
|
Before Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 127 B |
|
Before Width: | Height: | Size: 123 B |
|
Before Width: | Height: | Size: 139 B |
|
Before Width: | Height: | Size: 133 B |