diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-12-16 17:37:11 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-12-16 17:37:11 +0100 |
commit | b11af2e990dafe640dda9b94739e0f753e685b87 (patch) | |
tree | d2e328328e89f5809f81e04ae0694238a5123c8b | |
parent | 91fbb65ed4e5dc843eb5b1c5d1bcb44a2f256967 (diff) | |
download | akono-b11af2e990dafe640dda9b94739e0f753e685b87.tar.gz akono-b11af2e990dafe640dda9b94739e0f753e685b87.tar.bz2 akono-b11af2e990dafe640dda9b94739e0f753e685b87.zip |
cleanup / deps version bump
-rw-r--r-- | akono/akono-akono.iml | 24 | ||||
-rw-r--r-- | akono/build.gradle.kts | 16 | ||||
-rw-r--r-- | akono/proguard-rules.pro | 2 | ||||
-rw-r--r-- | akono/src/androidTest/java/akono/InstrumentedAkonoTests.kt | 3 | ||||
-rw-r--r-- | akono/src/main/cpp/akono-jni.cpp | 12 | ||||
-rw-r--r-- | akono/src/main/java/akono/AkonoJni.kt | 4 |
6 files changed, 29 insertions, 32 deletions
diff --git a/akono/akono-akono.iml b/akono/akono-akono.iml index 80bdb714..20a87e2a 100644 --- a/akono/akono-akono.iml +++ b/akono/akono-akono.iml @@ -25,7 +25,7 @@ <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" /> - <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" /> + <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" /> <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> <option name="PROJECT_TYPE" value="1" /> </configuration> @@ -35,7 +35,7 @@ <compilerSettings /> <compilerArguments> <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" /> - <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.21/d207ce2c9bcf17dc8e51bab4dbfdac4d013e7138/kotlin-stdlib-jdk7-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.21/4bcc2012b84840e19e1e28074284cac908be0295/kotlin-stdlib-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.21/f30e4a9897913e53d778f564110bafa1fef46643/kotlin-stdlib-common-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/dold/repos/akono/akono/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar:/home/dold/opt/android-sdk/platforms/android-28/android.jar:/home/dold/opt/android-sdk/platforms/android-28/optional/android.test.mock.jar:/home/dold/opt/android-sdk/platforms/android-28/optional/android.test.base.jar:/home/dold/opt/android-sdk/platforms/android-28/optional/android.test.runner.jar" /> + <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.21/d207ce2c9bcf17dc8e51bab4dbfdac4d013e7138/kotlin-stdlib-jdk7-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.21/4bcc2012b84840e19e1e28074284cac908be0295/kotlin-stdlib-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.21/f30e4a9897913e53d778f564110bafa1fef46643/kotlin-stdlib-common-1.3.21.jar:/home/dold/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/dold/repos/akono/akono/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar:/home/dold/opt/android-sdk/platforms/android-29/android.jar:/home/dold/opt/android-sdk/platforms/android-29/optional/android.test.mock.jar:/home/dold/opt/android-sdk/platforms/android-29/optional/android.test.base.jar:/home/dold/opt/android-sdk/platforms/android-29/optional/android.test.runner.jar" /> <option name="noStdlib" value="true" /> <option name="noReflect" value="true" /> <option name="moduleName" value="akono_debug" /> @@ -131,7 +131,7 @@ <excludeFolder url="file://$MODULE_DIR$/.externalNativeBuild" /> <excludeFolder url="file://$MODULE_DIR$/build" /> </content> - <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" /> + <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" scope="TEST" name="Gradle: com.google.truth:truth:0.44@jar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.3.21@jar" level="project" /> @@ -153,18 +153,18 @@ <orderEntry type="library" scope="TEST" name="Gradle: com.google.auto.value:auto-value-annotations:1.6.3@jar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-common:1.3.21@jar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-test-annotations-common:1.3.21@jar" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.0@aar" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:truth:1.1.0@aar" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.1.0@aar" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:rules:1.1.1@aar" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.1.1@aar" level="project" /> - <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.1.1@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:junit:1.1.1@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.ext:truth:1.2.0@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:rules:1.2.0@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.2.0@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21@jar" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.21@jar" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.21@jar" level="project" /> <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" /> - <orderEntry type="library" name="Gradle: android.test.mock-android-28" level="project" /> - <orderEntry type="library" name="Gradle: android.test.base-android-28" level="project" /> - <orderEntry type="library" name="Gradle: android.test.runner-android-28" level="project" /> + <orderEntry type="library" name="Gradle: android.test.mock-android-29" level="project" /> + <orderEntry type="library" name="Gradle: android.test.base-android-29" level="project" /> + <orderEntry type="library" name="Gradle: android.test.runner-android-29" level="project" /> </component> </module>
\ No newline at end of file diff --git a/akono/build.gradle.kts b/akono/build.gradle.kts index 3fb5e31b..7f8d3a2b 100644 --- a/akono/build.gradle.kts +++ b/akono/build.gradle.kts @@ -6,10 +6,10 @@ plugins { } android { - compileSdkVersion(28) + compileSdkVersion(29) defaultConfig { minSdkVersion(21) - targetSdkVersion(28) + targetSdkVersion(29) versionCode = 1 versionName = "1.0" @@ -30,6 +30,8 @@ android { externalNativeBuild { cmake.arguments("-DANDROID_STL=c++_shared") } + + consumerProguardFiles("proguard-rules.pro") } useLibrary("android.test.runner") useLibrary("android.test.base") @@ -64,13 +66,13 @@ dependencies { // Use the Kotlin JUnit integration. testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") - androidTestImplementation("androidx.test:core:1.1.0") - androidTestImplementation("androidx.test:runner:1.1.1") - androidTestImplementation("androidx.test:rules:1.1.1") + androidTestImplementation("androidx.test:core:1.2.0") + androidTestImplementation("androidx.test:runner:1.2.0") + androidTestImplementation("androidx.test:rules:1.2.0") // Assertions - androidTestImplementation("androidx.test.ext:junit:1.1.0") - androidTestImplementation("androidx.test.ext:truth:1.1.0") + androidTestImplementation("androidx.test.ext:junit:1.1.1") + androidTestImplementation("androidx.test.ext:truth:1.2.0") androidTestImplementation("com.google.truth:truth:0.44") // Use the Kotlin test library. diff --git a/akono/proguard-rules.pro b/akono/proguard-rules.pro new file mode 100644 index 00000000..d6488930 --- /dev/null +++ b/akono/proguard-rules.pro @@ -0,0 +1,2 @@ +# Keep names because we use them from the JNI. +-keepnames class akono.AkonoJni { *; }
\ No newline at end of file diff --git a/akono/src/androidTest/java/akono/InstrumentedAkonoTests.kt b/akono/src/androidTest/java/akono/InstrumentedAkonoTests.kt index 26fb2012..0fbcb6f9 100644 --- a/akono/src/androidTest/java/akono/InstrumentedAkonoTests.kt +++ b/akono/src/androidTest/java/akono/InstrumentedAkonoTests.kt @@ -6,7 +6,6 @@ import org.junit.Test import androidx.test.filters.LargeTest import org.junit.Assert.assertEquals import akono.AkonoJni -import akono.ModuleResult import android.util.Log import java.util.concurrent.LinkedBlockingDeque @@ -25,7 +24,7 @@ class SyncMessageHandler : AkonoJni.MessageHandler { // @RunWith is required only if you use a mix of JUnit3 and JUnit4. @RunWith(AndroidJUnit4::class) @LargeTest -public class InstrumentedAkonoTestOne { +class InstrumentedAkonoTestOne { @Test fun myJsTest() { val ajni: AkonoJni = AkonoJni() diff --git a/akono/src/main/cpp/akono-jni.cpp b/akono/src/main/cpp/akono-jni.cpp index 0fd05a7e..f95a65cb 100644 --- a/akono/src/main/cpp/akono-jni.cpp +++ b/akono/src/main/cpp/akono-jni.cpp @@ -364,21 +364,16 @@ static void sendMessageCallback(const v8::FunctionCallbackInfo<v8::Value> &args) return; } - jstring jstr1 = env->NewStringUTF("message"); - jstring jstr2 = env->NewStringUTF(*value); + jstring payloadStr = env->NewStringUTF(*value); - jmethodID meth = env->GetMethodID(clazz, "internalOnNotify", "(Ljava/lang/String;Ljava/lang/String;)V"); + jmethodID meth = env->GetMethodID(clazz, "internalOnNotify", "(Ljava/lang/String;)V"); if (meth == nullptr) { mylog("FATAL: method not found"); return; } - env->CallVoidMethod(myInstance->currentJniThiz, meth, jstr1, jstr2); -} - -static void dummy(const v8::FunctionCallbackInfo<v8::Value> &args) { - + env->CallVoidMethod(myInstance->currentJniThiz, meth, payloadStr); } static void getModuleCode(const v8::FunctionCallbackInfo<v8::Value> &args) { @@ -435,6 +430,7 @@ Java_akono_AkonoJni_putModuleCodeNative(JNIEnv *env, jobject thiz, jstring modNa mylog("registered module"); } + extern "C" JNIEXPORT void JNICALL Java_akono_AkonoJni_notifyNative(JNIEnv *env, jobject thiz, jobject buf) { NativeAkonoInstance *myInstance = (NativeAkonoInstance *) env->GetDirectBufferAddress(buf); diff --git a/akono/src/main/java/akono/AkonoJni.kt b/akono/src/main/java/akono/AkonoJni.kt index e5a10547..148de1d7 100644 --- a/akono/src/main/java/akono/AkonoJni.kt +++ b/akono/src/main/java/akono/AkonoJni.kt @@ -2,7 +2,6 @@ package akono import android.util.Base64 import android.util.Log -import org.json.JSONObject import java.lang.Exception import java.nio.ByteBuffer import java.util.concurrent.CountDownLatch @@ -47,8 +46,7 @@ class AkonoJni(vararg nodeArgv: String) { /** * Called by node/v8 from its thread. */ - @Suppress("unused") - private fun internalOnNotify(type: String, payload: String) { + private fun internalOnNotify(payload: String) { messageHandler?.handleMessage(payload) } |