Skip to content
This repository was archived by the owner on Mar 25, 2019. It is now read-only.

Commit f73b23a

Browse files
author
ericwlange
committed
Preparing for 3.0.0 release
Moved JSString, JSWorkerQueue and JNIReturnObject and made them non-public. No reason to ever be used directly. Removed AndroidJSCoreTest as all tests are now in unit tests Updated documentation
1 parent 12cf68a commit f73b23a

74 files changed

Lines changed: 262 additions & 11281 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.

‎AndroidJSCore/.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AndroidJSCore/AndroidJSCore/build.gradle‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import org.apache.commons.io.FilenameUtils
2-
31
apply plugin: 'com.android.library'
42
apply plugin: 'jacoco'
53

@@ -11,7 +9,7 @@ android {
119
minSdkVersion 11
1210
targetSdkVersion 24
1311
versionCode 3
14-
versionName "3.0-pre2"
12+
versionName "3.0.0"
1513
setProperty("archivesBaseName", "AndroidJSCore-$versionName")
1614
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1715
}
@@ -49,8 +47,7 @@ task hemroidBuild(type: Exec) {
4947
}
5048
ndkDir = properties.getProperty('ndk.dir')
5149
}
52-
executable "sh"
53-
args "-c", "$ndkDir/ndk-build"
50+
executable "$ndkDir/ndk-build"
5451
}
5552

5653
preBuild.dependsOn hemroidBuild

‎AndroidJSCore/AndroidJSCore/jni/JSContext.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ NATIVE(JSContext,jobject,evaluateScript) (PARAMS, jlong ctx, jlong script,
120120

121121
JSValueRef exception = NULL;
122122

123-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
123+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
124124
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
125125
jobject out = env->NewObject(ret, cid);
126126

@@ -148,7 +148,7 @@ NATIVE(JSContext,jobject,checkScriptSyntax) (PARAMS, jlong ctx, jlong script,
148148

149149
JSValueRef exception = NULL;
150150

151-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
151+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
152152
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
153153
jobject out = env->NewObject(ret, cid);
154154

‎AndroidJSCore/AndroidJSCore/jni/JSObject.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ NATIVE(JSObject,jobject,makeArray) (PARAMS, jlong ctx, jlongArray args) {
6464
}
6565
env->ReleaseLongArrayElements(args, values, 0);
6666

67-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
67+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
6868
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
6969
jobject out = env->NewObject(ret, cid);
7070

@@ -95,7 +95,7 @@ NATIVE(JSObject,jobject,makeDate) (PARAMS, jlong ctx, jlongArray args) {
9595
}
9696
env->ReleaseLongArrayElements(args, values, 0);
9797

98-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
98+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
9999
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
100100
jobject out = env->NewObject(ret, cid);
101101

@@ -125,7 +125,7 @@ NATIVE(JSObject,jobject,makeError) (PARAMS, jlong ctx, jlongArray args) {
125125
}
126126
env->ReleaseLongArrayElements(args, values, 0);
127127

128-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
128+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
129129
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
130130
jobject out = env->NewObject(ret, cid);
131131

@@ -155,7 +155,7 @@ NATIVE(JSObject,jobject,makeRegExp) (PARAMS, jlong ctx, jlongArray args) {
155155
}
156156
env->ReleaseLongArrayElements(args, values, 0);
157157

158-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
158+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
159159
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
160160
jobject out = env->NewObject(ret, cid);
161161

@@ -187,7 +187,7 @@ NATIVE(JSObject,jobject,makeFunction) (PARAMS, jlong ctx, jlong name,
187187
}
188188
env->ReleaseLongArrayElements(parameterNames, parameters, 0);
189189

190-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
190+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
191191
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
192192
jobject out = env->NewObject(ret, cid);
193193

@@ -231,7 +231,7 @@ NATIVE(JSObject,jobject,getProperty) (PARAMS, jlong ctx, jlong object,
231231

232232
JSValueRef exception = NULL;
233233

234-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
234+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
235235
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
236236
jobject out = env->NewObject(ret, cid);
237237

@@ -254,7 +254,7 @@ NATIVE(JSObject,jobject,setProperty) (PARAMS, jlong ctx, jlong object, jlong pro
254254

255255
JSValueRef exception = NULL;
256256

257-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
257+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
258258
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
259259
jobject out = env->NewObject(ret, cid);
260260

@@ -272,7 +272,7 @@ NATIVE(JSObject,jobject,deleteProperty) (PARAMS, jlong ctx, jlong object,
272272

273273
JSValueRef exception = NULL;
274274

275-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
275+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
276276
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
277277
jobject out = env->NewObject(ret, cid);
278278

@@ -294,7 +294,7 @@ NATIVE(JSObject,jobject,getPropertyAtIndex) (PARAMS, jlong ctx, jlong object,
294294

295295
JSValueRef exception = NULL;
296296

297-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
297+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
298298
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
299299
jobject out = env->NewObject(ret, cid);
300300

@@ -317,7 +317,7 @@ NATIVE(JSObject,jobject,setPropertyAtIndex) (PARAMS, jlong ctx, jlong object,
317317

318318
JSValueRef exception = NULL;
319319

320-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
320+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
321321
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
322322
jobject out = env->NewObject(ret, cid);
323323

@@ -358,7 +358,7 @@ NATIVE(JSObject,jobject,callAsFunction) (PARAMS, jlong ctx, jlong object,
358358
}
359359
env->ReleaseLongArrayElements(args, values, 0);
360360

361-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
361+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
362362
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
363363
jobject out = env->NewObject(ret, cid);
364364

@@ -395,7 +395,7 @@ NATIVE(JSObject,jobject,callAsConstructor) (PARAMS, jlong ctx, jlong object,
395395
}
396396
env->ReleaseLongArrayElements(args, values, 0);
397397

398-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
398+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
399399
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
400400
jobject out = env->NewObject(ret, cid);
401401

‎AndroidJSCore/AndroidJSCore/jni/JSString.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include "JSJNI.h"
3535

36-
NATIVE(JSString,jlong,createWithCharacters) (PARAMS, jstring str)
36+
NATIVE(JSValue_00024JSString,jlong,createWithCharacters) (PARAMS, jstring str)
3737
{
3838
const jchar *chars = env->GetStringChars(str, NULL);
3939
JSStringRef string = JSStringRetain(JSStringCreateWithCharacters(chars,
@@ -42,27 +42,27 @@ NATIVE(JSString,jlong,createWithCharacters) (PARAMS, jstring str)
4242
return (long)string;
4343
}
4444

45-
NATIVE(JSString,jlong,createWithUTF8CString) (PARAMS, jstring str)
45+
NATIVE(JSValue_00024JSString,jlong,createWithUTF8CString) (PARAMS, jstring str)
4646
{
4747
const char *string = env->GetStringUTFChars(str, NULL);
4848
JSStringRef ret = JSStringRetain(JSStringCreateWithUTF8CString(string));
4949
env->ReleaseStringUTFChars(str, string);
5050
return (long)ret;
5151
}
5252

53-
NATIVE(JSString,jlong,retain) (PARAMS, jlong strRef) {
53+
NATIVE(JSValue_00024JSString,jlong,retain) (PARAMS, jlong strRef) {
5454
return (jlong) JSStringRetain((JSStringRef)strRef);
5555
}
5656

57-
NATIVE(JSString,void,release) (PARAMS, jlong stringRef) {
57+
NATIVE(JSValue_00024JSString,void,release) (PARAMS, jlong stringRef) {
5858
JSStringRelease((JSStringRef)stringRef);
5959
}
6060

61-
NATIVE(JSString,jint,getLength) (PARAMS, jlong stringRef) {
61+
NATIVE(JSValue_00024JSString,jint,getLength) (PARAMS, jlong stringRef) {
6262
return (jint) JSStringGetLength((JSStringRef)stringRef);
6363
}
6464

65-
NATIVE(JSString,jstring,toString) (PARAMS, jlong stringRef) {
65+
NATIVE(JSValue_00024JSString,jstring,toString) (PARAMS, jlong stringRef) {
6666
char *buffer = new char[JSStringGetMaximumUTF8CStringSize((JSStringRef)stringRef)+1];
6767
JSStringGetUTF8CString((JSStringRef)stringRef, buffer,
6868
JSStringGetMaximumUTF8CStringSize((JSStringRef)stringRef)+1);
@@ -71,15 +71,15 @@ NATIVE(JSString,jstring,toString) (PARAMS, jlong stringRef) {
7171
return ret;
7272
}
7373

74-
NATIVE(JSString,jint,getMaximumUTF8CStringSize) (PARAMS, jlong stringRef) {
74+
NATIVE(JSValue_00024JSString,jint,getMaximumUTF8CStringSize) (PARAMS, jlong stringRef) {
7575
return (jint) JSStringGetMaximumUTF8CStringSize((JSStringRef)stringRef);
7676
}
7777

78-
NATIVE(JSString,jboolean,isEqual) (PARAMS, jlong a, jlong b) {
78+
NATIVE(JSValue_00024JSString,jboolean,isEqual) (PARAMS, jlong a, jlong b) {
7979
return (jboolean) JSStringIsEqual((JSStringRef)a, (JSStringRef)b);
8080
}
8181

82-
NATIVE(JSString,jboolean,isEqualToUTF8CString) (PARAMS, jlong a, jstring b) {
82+
NATIVE(JSValue_00024JSString,jboolean,isEqualToUTF8CString) (PARAMS, jlong a, jstring b) {
8383
const char *string = env->GetStringUTFChars(b, NULL);
8484
jboolean ret = JSStringIsEqualToUTF8CString((JSStringRef)a, string);
8585
env->ReleaseStringUTFChars(b, string);

‎AndroidJSCore/AndroidJSCore/jni/JSValue.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ NATIVE(JSValue,jobject,isEqual) (PARAMS, jlong ctxRef, jlong a, jlong b)
8484
{
8585
JSValueRef exception = NULL;
8686

87-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
87+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
8888
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
8989
jobject out = env->NewObject(ret, cid);
9090

@@ -111,7 +111,7 @@ NATIVE(JSValue,jobject,isInstanceOfConstructor) (PARAMS, jlong ctxRef, jlong val
111111
{
112112
JSValueRef exception = NULL;
113113

114-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
114+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
115115
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
116116
jobject out = env->NewObject(ret, cid);
117117

@@ -178,7 +178,7 @@ NATIVE(JSValue,jobject,createJSONString) (PARAMS, jlong ctxRef, jlong valueRef,
178178
{
179179
JSValueRef exception = NULL;
180180

181-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
181+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
182182
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
183183
jobject out = env->NewObject(ret, cid);
184184

@@ -210,7 +210,7 @@ NATIVE(JSValue,jobject,toNumber) (PARAMS, jlong ctxRef, jlong valueRef)
210210
{
211211
JSValueRef exception = NULL;
212212

213-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
213+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
214214
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
215215
jobject out = env->NewObject(ret, cid);
216216

@@ -230,7 +230,7 @@ NATIVE(JSValue,jobject,toStringCopy) (PARAMS, jlong ctxRef, jlong valueRef)
230230
{
231231
JSValueRef exception = NULL;
232232

233-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
233+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
234234
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
235235
jobject out = env->NewObject(ret, cid);
236236

@@ -252,7 +252,7 @@ NATIVE(JSValue,jobject,toObject) (PARAMS, jlong ctxRef, jlong valueRef)
252252
{
253253
JSValueRef exception = NULL;
254254

255-
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JNIReturnObject");
255+
jclass ret = env->FindClass("org/liquidplayer/webkit/javascriptcore/JSValue$JNIReturnObject");
256256
jmethodID cid = env->GetMethodID(ret,"<init>","()V");
257257
jobject out = env->NewObject(ret, cid);
258258

‎AndroidJSCore/AndroidJSCore/src/androidTest/java/org/liquidplayer/webkit/javascriptcore/JSStringTest.java‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎AndroidJSCore/AndroidJSCore/src/androidTest/java/org/liquidplayer/webkit/javascriptcore/JSValueTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ public void testJSValueConstructors() throws Exception {
4848
* new JSValue(context,string)
4949
*/
5050
JSValue str1 = new JSValue(context,"This is a string");
51-
JSValue str2 = new JSValue(context,new JSString("This is a string on drugs"));
5251
assertTrue(str1.isString());
53-
assertTrue(str2.isString());
5452

5553
/**
5654
* new JSValue(context,Object)

‎AndroidJSCore/AndroidJSCore/src/main/java/org/liquidplayer/webkit/javascriptcore/JNIReturnObject.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎AndroidJSCore/AndroidJSCore/src/main/java/org/liquidplayer/webkit/javascriptcore/JSException.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ public String name() {
101101
public String toString() {
102102
if (error!=null) {
103103
try {
104-
JSString msg = error.toJSString();
105-
return msg.toString();
104+
return error.toString();
106105
} catch (JSException e) {
107106
return "Unknown Error";
108107
}

0 commit comments

Comments
 (0)