[sword-svn] r3810 - in trunk: bindings/Android/SWORD/app bindings/cordova/cordova-plugin-crosswire-sword include src/utilfuns

[scribe at crosswire.org]

Author: scribe
Date: 2020-10-10 03:39:02 -0400 (Sat, 10 Oct 2020)
New Revision: 3810

Modified:
   trunk/bindings/Android/SWORD/app/build.gradle
   trunk/bindings/cordova/cordova-plugin-crosswire-sword/package.json
   trunk/bindings/cordova/cordova-plugin-crosswire-sword/plugin.xml
   trunk/include/defs.h
   trunk/src/utilfuns/swobject.cpp
Log:
Updated android bindings for latest NDK
Updated cordova plugin from latest android bindings
Fixed SWDYNAMIC_CAST to still match with 'const ' qualifier before class type
Avoid redefine warning when using SWDYNAMIC_CAST polyfill


Modified: trunk/bindings/Android/SWORD/app/build.gradle
===================================================================
--- trunk/bindings/Android/SWORD/app/build.gradle	2020-10-02 13:30:56 UTC (rev 3809)
+++ trunk/bindings/Android/SWORD/app/build.gradle	2020-10-10 07:39:02 UTC (rev 3810)
@@ -2,7 +2,7 @@
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "29.0.2"
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         applicationId "org.crosswire.android.sword"
@@ -37,7 +37,7 @@
         }
     }
     flavorDimensions 'Fast'
-    ndkVersion '20.0.5594570'
+    ndkVersion '21.3.6528147'
 }
 
 dependencies {

Modified: trunk/bindings/cordova/cordova-plugin-crosswire-sword/package.json
===================================================================
--- trunk/bindings/cordova/cordova-plugin-crosswire-sword/package.json	2020-10-02 13:30:56 UTC (rev 3809)
+++ trunk/bindings/cordova/cordova-plugin-crosswire-sword/package.json	2020-10-10 07:39:02 UTC (rev 3810)
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-crosswire-sword",
-  "version": "0.1.10",
+  "version": "0.2.0",
   "description": "The SWORD Project Plugin",
   "cordova": {
     "id": "cordova-plugin-crosswire-sword",

Modified: trunk/bindings/cordova/cordova-plugin-crosswire-sword/plugin.xml
===================================================================
--- trunk/bindings/cordova/cordova-plugin-crosswire-sword/plugin.xml	2020-10-02 13:30:56 UTC (rev 3809)
+++ trunk/bindings/cordova/cordova-plugin-crosswire-sword/plugin.xml	2020-10-10 07:39:02 UTC (rev 3810)
@@ -4,7 +4,7 @@
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-plugin-crosswire-sword"
-    version="0.1.10">
+    version="0.2.0">
     <name>cordova-plugin-crosswire-sword</name>
     <description>The SWORD Project Plugin</description>
     <license>GNU 2.0</license>

Modified: trunk/include/defs.h
===================================================================
--- trunk/include/defs.h	2020-10-02 13:30:56 UTC (rev 3809)
+++ trunk/include/defs.h	2020-10-10 07:39:02 UTC (rev 3810)
@@ -47,6 +47,8 @@
 #define SWDYNAMIC_CAST(className, object) dynamic_cast<className *>(object)
 
 #ifdef NODYNCAST
+// avoid redefined warnings
+#undef SWDYNAMIC_CAST
 #define SWDYNAMIC_CAST(className, object) (className *)((object)?((object->getClass()->isAssignableFrom(#className))?object:0):0)
 #endif
 

Modified: trunk/src/utilfuns/swobject.cpp
===================================================================
--- trunk/src/utilfuns/swobject.cpp	2020-10-02 13:30:56 UTC (rev 3809)
+++ trunk/src/utilfuns/swobject.cpp	2020-10-10 07:39:02 UTC (rev 3810)
@@ -35,6 +35,9 @@
 
 
 bool SWClass::isAssignableFrom(const char *className) const {
+	// skip class qualifier, like 'const VerseKey'
+	const char *space = strchr(className, ' ');
+	if (space) className = space + 1;
 	for (int i = 0; descends[i]; ++i) {
 #ifndef __CYGWIN__
 		if (!sword::stricmp(descends[i], className))