Skip to content

Commit 9ef1bdc

Browse files
authored
Merge pull request shannah#42 from andriy-gerasika/feature/noJavaNativeFoundation
bugfix for shannah#41 -- remove JavaNativeFoundation framework
2 parents 2184faf + d58fe27 commit 9ef1bdc

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

libjcocoa.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
398F66BB22CBD46F00B9E1B6 /* libjcocoaTests-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 398F66B922CBD46E00B9E1B6 /* libjcocoaTests-Info.plist */; };
3131
398F66BC22CBD46F00B9E1B6 /* en.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 398F66BA22CBD46E00B9E1B6 /* en.lproj */; };
3232
398F66BF22CBD69100B9E1B6 /* libjcocoaTests.octest in Resources */ = {isa = PBXBuildFile; fileRef = 65152918163458B4002A41D8 /* libjcocoaTests.octest */; };
33-
6508F916163A015D009222BB /* JavaNativeFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6508F914163A015D009222BB /* JavaNativeFoundation.framework */; };
3433
65152908163458B4002A41D8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65152907163458B4002A41D8 /* Cocoa.framework */; };
3534
6515291A163458B4002A41D8 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65152919163458B4002A41D8 /* SenTestingKit.framework */; };
3635
6515291B163458B4002A41D8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65152907163458B4002A41D8 /* Cocoa.framework */; };
@@ -72,7 +71,6 @@
7271
398F66B722CBD46300B9E1B6 /* libjcocoaTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libjcocoaTests.h; path = src/test/objectivec/libjcocoaTests.h; sourceTree = "<group>"; };
7372
398F66B922CBD46E00B9E1B6 /* libjcocoaTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "libjcocoaTests-Info.plist"; path = "src/test/resources/libjcocoaTests-Info.plist"; sourceTree = "<group>"; };
7473
398F66BA22CBD46E00B9E1B6 /* en.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; name = en.lproj; path = src/test/resources/en.lproj; sourceTree = "<group>"; };
75-
6508F914163A015D009222BB /* JavaNativeFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaNativeFoundation.framework; sourceTree = "<group>"; };
7674
65152904163458B4002A41D8 /* libjcocoa.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libjcocoa.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
7775
65152907163458B4002A41D8 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
7876
6515290A163458B4002A41D8 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -89,7 +87,6 @@
8987
buildActionMask = 2147483647;
9088
files = (
9189
65152908163458B4002A41D8 /* Cocoa.framework in Frameworks */,
92-
6508F916163A015D009222BB /* JavaNativeFoundation.framework in Frameworks */,
9390
);
9491
runOnlyForDeploymentPostprocessing = 0;
9592
};
@@ -172,7 +169,6 @@
172169
6508F913163A015D009222BB /* Frameworks */ = {
173170
isa = PBXGroup;
174171
children = (
175-
6508F914163A015D009222BB /* JavaNativeFoundation.framework */,
176172
);
177173
name = Frameworks;
178174
path = ../../../../../../System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks;

src/main/objectivec/implementation/WLJavaProxy.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
#import "WLJavaProxy.h"
10-
#include <JavaNativeFoundation/JavaNativeFoundation.h>
1110
#include "JavaUtil.h"
1211

1312
static JavaVM *jvm = NULL;

src/main/objectivec/implementation/jnaexample_NativeClient_Setup.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* DO NOT EDIT THIS FILE - it is machine generated */
22
#include <jnaexample_NativeClient_Setup.h>
3-
#include <JavaNativeFoundation/JavaNativeFoundation.h>
43
#include <WLJavaProxy.h>
54
#include "JavaUtil.h"
65

@@ -30,6 +29,10 @@ void exceptionHandler(NSException *exception)
3029
}
3130
}
3231

32+
#ifndef ptr_to_jlong
33+
#define ptr_to_jlong(a) ((jlong)(uintptr_t)(a))
34+
#endif
35+
3336
/*
3437
* Class: jnaexample_NativeClient_Setup
3538
* Method: createProxy

0 commit comments

Comments
 (0)