Merge pull request #127 from chrisws/12_22

ANDROID: bump version

Author: chrisws

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [12.22])
+AC_INIT([smallbasic], [12.23])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

src/common/Makefile.am

@@ -13,27 +13,13 @@ endif
 AM_CPPFLAGS = -I$(abs_top_builddir)/src -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\"
 
 EXTRA_DIST =                              \
-    keywords.c                            \
-    ../languages/chars.el.h               \
     ../languages/chars.en.h               \
-    ../languages/keywords.el.c            \
     ../languages/keywords.en.c            \
-    ../languages/messages.el.h            \
     ../languages/messages.en.h            \
-    ../modules/configure.in               \
-    ../modules/example1.c                 \
-    ../modules/Makefile.am                \
-    ../modules/mod_utils.c                \
-    ../modules/mod_utils.h                \
-    ../modules/example1.c                 \
-    ../modules/flite/flite.c              \
-    ../modules/flite/Makefile             \
-    ../modules/flite/README.TXT           \
-    ../modules/flite/test.bas             \
-    ../modules/gdbm/gdbm.c                \
-    ../modules/gdbm/Makefile              \
-    ../modules/mysql/Makefile.am          \
-    ../modules/mysql/mysql.c
+    ../include/module.h                   \
+    ../include/osd.h                      \
+    ../include/var.h                      \
+    ../include/var_map.h
 
 noinst_LIBRARIES = libsb_common.a
 
@@ -64,7 +50,7 @@ libsb_common_a_SOURCES =                  \
     fs_socket_client.c fs_socket_client.h \
     fs_stream.c fs_stream.h               \
     g_line.c                              \
-    geom.c geom.h g_bmp.h                 \
+    geom.c geom.h                         \
     inet.c inet.h                         \
     kw.c kw.h                             \
     pfill.c                               \
@@ -75,13 +61,12 @@ libsb_common_a_SOURCES =                  \
     str.c str.h                           \
     tasks.c tasks.h                       \
     hashmap.c hashmap.h                   \
-    var_map.c var_map.h                   \
+    var_map.c                             \
     var_eval.c var_eval.h                 \
     keymap.c keymap.h                     \
     units.c units.h                       \
     var.c var.h                           \
     messages.h                            \
-    osd.h                                 \
     sbapp.h                               \
     smbas.h                               \
     sys.h

src/platform/android/app/build.gradle

@@ -9,8 +9,8 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 30
-    versionCode 49
-    versionName "12.22"
+    versionCode 50
+    versionName "12.23"
     resConfigs "en"
   }
 

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -25,6 +25,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -103,11 +104,11 @@ public class MainActivity extends NativeActivity {
   private boolean _untrusted = false;
   private final ExecutorService _audioExecutor = Executors.newSingleThreadExecutor();
   private final Queue<Sound> _sounds = new ConcurrentLinkedQueue<>();
+  private final Handler _keypadHandler = new Handler(Looper.getMainLooper());
   private String[] _options = null;
   private MediaPlayer _mediaPlayer = null;
   private LocationAdapter _locationAdapter = null;
   private TextToSpeechAdapter _tts;
-  private Handler _keypadHandler = new Handler();
 
   static {
     System.loadLibrary("smallbasic");

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.0.0'
+    classpath 'com.android.tools.build:gradle:7.0.1'
   }
 }