Skip to content

Commit 2bb9c11

Browse files
johnno1962johnno1962
committed
Refresh
1 parent d2e8865 commit 2bb9c11

98 files changed

Lines changed: 1198 additions & 1099 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
4+
<classpathentry kind="lib" path="/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar" sourcepath="/Library/Java/JavaVirtualMachines/1.6.0_41-b02-445.jdk/Contents/Home/src.jar"/>
55
<classpathentry kind="output" path="bin"/>
66
</classpath>

‎CJavaVM‎

‎README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@ PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
217217
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
218218
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
219219

220-
This License does not apply to any generated code in the java* submodules which
221-
are provided under the provisions of "Fair Use" but your use is ultimately subject
222-
to the Oracle Binary Code License Agreement available here:
223-
224-
[http://www.oracle.com/technetwork/java/javase/terms/license/index.html](http://www.oracle.com/technetwork/java/javase/terms/license/index.html)
225-
220+
This License does not apply to the code generated from the Apple distribution of the Java VM
221+
which are provided under the provisions of "Fair Use" but your use is ultimately subject
222+
to the original License Agreement.

‎SwiftJava.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
isa = PBXProject;
535535
attributes = {
536536
LastSwiftUpdateCheck = 0800;
537-
LastUpgradeCheck = 0800;
537+
LastUpgradeCheck = 0820;
538538
ORGANIZATIONNAME = "John Holdsworth";
539539
TargetAttributes = {
540540
BB5ACFDA1D35B09900E2386A = {
@@ -826,8 +826,10 @@
826826
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
827827
CLANG_WARN_EMPTY_BODY = YES;
828828
CLANG_WARN_ENUM_CONVERSION = YES;
829+
CLANG_WARN_INFINITE_RECURSION = YES;
829830
CLANG_WARN_INT_CONVERSION = YES;
830831
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
832+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
831833
CLANG_WARN_UNREACHABLE_CODE = YES;
832834
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
833835
CODE_SIGN_IDENTITY = "";
@@ -873,8 +875,10 @@
873875
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
874876
CLANG_WARN_EMPTY_BODY = YES;
875877
CLANG_WARN_ENUM_CONVERSION = YES;
878+
CLANG_WARN_INFINITE_RECURSION = YES;
876879
CLANG_WARN_INT_CONVERSION = YES;
877880
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
881+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
878882
CLANG_WARN_UNREACHABLE_CODE = YES;
879883
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
880884
CODE_SIGN_IDENTITY = "";
@@ -933,10 +937,6 @@
933937
buildSettings = {
934938
CODE_SIGN_IDENTITY = "-";
935939
LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
936-
LIBRARY_SEARCH_PATHS = (
937-
"$(inherited)",
938-
"$(LOCAL_LIBRARY_DIR)/Java/JavaVirtualMachines/jdk1.8.0_91.jdk/Contents/Home/jre/lib/server",
939-
);
940940
PRODUCT_NAME = "$(TARGET_NAME)";
941941
SWIFT_VERSION = 3.0;
942942
};
@@ -947,10 +947,6 @@
947947
buildSettings = {
948948
CODE_SIGN_IDENTITY = "-";
949949
LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
950-
LIBRARY_SEARCH_PATHS = (
951-
"$(inherited)",
952-
"$(LOCAL_LIBRARY_DIR)/Java/JavaVirtualMachines/jdk1.8.0_91.jdk/Contents/Home/jre/lib/server",
953-
);
954950
PRODUCT_NAME = "$(TARGET_NAME)";
955951
SWIFT_VERSION = 3.0;
956952
};

‎com_apple‎

‎examples‎

‎genie.jar‎

5 Bytes
Binary file not shown.

‎genpkg.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ cd `dirname $0`
77

88
XCODEBUILD=/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
99

10+
# downloadable from https://support.apple.com/kb/dl1572?locale=en_US
11+
JAVA_HOME=/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
12+
1013
for i in $*; do
11-
./genswift.sh $i
14+
./genswift.sh $i $JAVA_HOME/../Classes/ui.jar
1215
./overrides.pl $i
1316
while true; do
1417
($XCODEBUILD SYMROOT=/tmp -config Debug -target examples -project SwiftJava.xcodeproj; STATUS=$?) | tee -a $i/build.log

‎java_awt‎

‎java_lang‎

0 commit comments

Comments
 (0)