diff --git a/ReadMe.txt b/ReadMe.txt index ebb7ffa..619daac 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -58,7 +58,7 @@ LINKS CHANGES -Version 2.8 (2024-xx-xx) +Version 2.8 (2024-10-29) - Updated source code with Emu48 version 1.66+. - Fix an USB serial issue with Android 13+ (fix #23). diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 1d44943..759d2f7 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.6.0) project("org.emulator.calculator.EmuApplication") - #add_compile_options(-DDEBUG_DISPLAY) #add_compile_options(-DDEBUG_SOUND) #add_compile_options(-DDEBUG_DEBUGGER) diff --git a/app/build.gradle b/app/build.gradle index a82288b..dd007f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { applicationId "org.emulator.forty.eight" minSdk 21 targetSdk 34 - versionCode 26 - versionName "2.7" + versionCode 27 + versionName "2.8" setProperty("archivesBaseName", "Emu48-v$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { @@ -90,6 +90,6 @@ dependencies { implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.documentfile:documentfile:1.0.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test:runner:1.6.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } diff --git a/app/src/main/assets/ReadMe.txt b/app/src/main/assets/ReadMe.txt index 5946a1b..516baf4 100644 --- a/app/src/main/assets/ReadMe.txt +++ b/app/src/main/assets/ReadMe.txt @@ -58,7 +58,7 @@ LINKS CHANGES -Version 2.8 (2024-xx-xx) +Version 2.8 (2024-10-29) - Updated source code with Emu48 version 1.66+. - Fix an USB serial issue with Android 13+ (fix #23). diff --git a/app/src/main/cpp/emu-jni.c b/app/src/main/cpp/emu-jni.c index 2e8563c..afff63d 100644 --- a/app/src/main/cpp/emu-jni.c +++ b/app/src/main/cpp/emu-jni.c @@ -88,7 +88,7 @@ enum CALLBACK_TYPE { }; // https://stackoverflow.com/questions/9630134/jni-how-to-callback-from-c-or-c-to-java -int mainViewCallback(int type, int param1, int param2/*, const TCHAR * param3, const TCHAR * param4*/) { +int mainViewCallback(int type, int param1, int param2) { if (mainActivity) { JNIEnv *jniEnv = getJNIEnvironment(); if(jniEnv) { @@ -895,7 +895,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_emulator_calculator_NativeLib_getObjects JNIEXPORT jint JNICALL Java_org_emulator_calculator_NativeLib_onObjectSave(JNIEnv *env, jobject thisz, jstring filename, jbooleanArray objectsToSaveItemChecked) { - const char *filenameUTF8 = (*env)->GetStringUTFChars(env, filename , NULL) ; + const char *filenameUTF8 = (*env)->GetStringUTFChars(env, filename , NULL); if (nState != SM_RUN) {