Fixes some new Android requirements; adds SystemConfiguration framework on MacOS to link flags in preparation to updating curl dependency; fixes rich-text word boundary detection for non-latin languages

Author: solodon4

cmake/Modules/CocosConfigDepend.cmake

@@ -48,6 +48,7 @@ macro(cocos2dx_depend)
             find_library(IOKIT_LIBRARY IOKit)
             find_library(APPKIT_LIBRARY AppKit)
             find_library(ICONV_LIBRARY iconv)
+            find_library(SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
             list(APPEND PLATFORM_SPECIFIC_LIBS
                  ${COCOA_LIBRARY}
                  ${OPENGL_LIBRARY}
@@ -56,6 +57,7 @@ macro(cocos2dx_depend)
                  ${COCOS_APPLE_LIBS}
                  ${APPKIT_LIBRARY}
                  ${ICONV_LIBRARY}
+                 ${SYSTEM_CONFIGURATION_LIBRARY}
                  )
         elseif(IOS)
             # Locate system libraries on iOS

cocos/platform/android/libcocos2dx/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
+    namespace "org.cocos2dx.lib"
     compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
@@ -22,6 +23,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        aidl true
+    }
 }
 
 dependencies {

cocos/ui/UIRichText.cpp

@@ -1498,7 +1498,7 @@ void RichText::formatText()
 namespace {
     inline bool isUTF8CharWrappable(const StringUtils::StringUTF8::CharUTF8& ch)
     {
-        return (!ch.isASCII() || !std::isalnum(ch._char[0], std::locale()));
+        return ch.isASCII() && !std::isalnum(ch._char[0], std::locale()) && ch._char[0] != '\''; // !ASCII || !alnum was too broad effectively breaking inside any non-Latin word! Apostrophe is a common word character in languages like Ukrainian and English.
     }
 
     int getPrevWordPos(const StringUtils::StringUTF8& text, int idx)