[sword-svn] r3673 - in trunk/bindings: cordova cordova/cordova-plugin-crosswire-sword/src/ios objc/SWORD/SWORD.xcodeproj/project.xcworkspace/xcuserdata/scribe.xcuserdatad

[scribe at crosswire.org]

Author: scribe
Date: 2019-07-06 16:27:48 -0700 (Sat, 06 Jul 2019)
New Revision: 3673

Modified:
   trunk/bindings/cordova/Makefile
   trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/ios/SWORD.swift
   trunk/bindings/objc/SWORD/SWORD.xcodeproj/project.xcworkspace/xcuserdata/scribe.xcuserdatad/UserInterfaceState.xcuserstate
Log:
added strip target for objc bindings. fixed swift binder per Apple's silly requirements.


Modified: trunk/bindings/cordova/Makefile
===================================================================
--- trunk/bindings/cordova/Makefile	2019-07-06 22:34:35 UTC (rev 3672)
+++ trunk/bindings/cordova/Makefile	2019-07-06 23:27:48 UTC (rev 3673)
@@ -18,3 +18,8 @@
 publish:
 	npm publish cordova-plugin-crosswire-sword/
 
+strip:
+	./libstrip.sh cordova-plugin-crosswire-sword/libs/ios/libSWORD.a
+	./libstrip.sh cordova-plugin-crosswire-sword/libs/ios/libcurl.a
+	mv cordova-plugin-crosswire-sword/libs/ios/libSWORD.a-stripped cordova-plugin-crosswire-sword/libs/ios/libSWORD.a
+	mv cordova-plugin-crosswire-sword/libs/ios/libcurl.a-stripped cordova-plugin-crosswire-sword/libs/ios/libcurl.a

Modified: trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/ios/SWORD.swift
===================================================================
--- trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/ios/SWORD.swift	2019-07-06 22:34:35 UTC (rev 3672)
+++ trunk/bindings/cordova/cordova-plugin-crosswire-sword/src/ios/SWORD.swift	2019-07-06 23:27:48 UTC (rev 3673)
@@ -321,11 +321,11 @@
         org_crosswire_sword_SWModule_begin(mod)
         while (org_crosswire_sword_SWModule_popError(mod) == 0) {
             let vkInfo = getStringArray(buffer: org_crosswire_sword_SWModule_getKeyChildren(mod));
-            var bookInfo = [
+            let bookInfo = [
                 "name": vkInfo[VERSEKEY_BOOKNAME],
                 "abbrev": vkInfo[VERSEKEY_BOOKABBREV],
                 "osisName": vkInfo[VERSEKEY_OSISBOOKNAME],
-                "chapterMax": vkInfo[VERSEKEY_CHAPTERMAX],
+                "chapterMax": Int(vkInfo[VERSEKEY_CHAPTERMAX]),
             ] as [AnyHashable : Any]
             retVal.append(bookInfo)
 
@@ -637,17 +637,17 @@
     func getVerseKey(keyChildren:[String]) -> [String:Any] {
         var retVal = [String:Any]()
         if (keyChildren.count > 9) {
-            retVal["testament"]   = Int(keyChildren[VERSEKEY_TESTAMENT]);
-            retVal["book"]        = Int(keyChildren[VERSEKEY_BOOK]);
-            retVal["chapter"]     = Int(keyChildren[VERSEKEY_CHAPTER]);
-            retVal["verse"]       = Int(keyChildren[VERSEKEY_VERSE]);
-            retVal["chapterMax"]  = Int(keyChildren[VERSEKEY_CHAPTERMAX]);
-            retVal["verseMax"]    = Int(keyChildren[VERSEKEY_VERSEMAX]);
-            retVal["bookName"]    = keyChildren[VERSEKEY_BOOKNAME];
-            retVal["osisRef"]     = keyChildren[VERSEKEY_OSISREF];
-            retVal["shortText"]   = keyChildren[VERSEKEY_SHORTTEXT];
-            retVal["bookAbbrev"]  = keyChildren[VERSEKEY_BOOKABBREV];
-            retVal["osisBookName"]= keyChildren[VERSEKEY_OSISBOOKNAME];
+            retVal["testament"]    = Int(keyChildren[VERSEKEY_TESTAMENT]);
+            retVal["book"]         = Int(keyChildren[VERSEKEY_BOOK]);
+            retVal["chapter"]      = Int(keyChildren[VERSEKEY_CHAPTER]);
+            retVal["verse"]        = Int(keyChildren[VERSEKEY_VERSE]);
+            retVal["chapterMax"]   = Int(keyChildren[VERSEKEY_CHAPTERMAX]);
+            retVal["verseMax"]     = Int(keyChildren[VERSEKEY_VERSEMAX]);
+            retVal["bookName"]     = keyChildren[VERSEKEY_BOOKNAME];
+            retVal["osisRef"]      = keyChildren[VERSEKEY_OSISREF];
+            retVal["shortText"]    = keyChildren[VERSEKEY_SHORTTEXT];
+            retVal["bookAbbrev"]   = keyChildren[VERSEKEY_BOOKABBREV];
+            retVal["osisBookName"] = keyChildren[VERSEKEY_OSISBOOKNAME];
         }
         return retVal;
     }

Modified: trunk/bindings/objc/SWORD/SWORD.xcodeproj/project.xcworkspace/xcuserdata/scribe.xcuserdatad/UserInterfaceState.xcuserstate
===================================================================
(Binary files differ)