Merge pull request #18 from zhaoxuan/master

Modify Android NDK compiler from GCC (deprecated) to Clang (recommended)

Author: vimfung

Source/Android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
@@ -18,8 +18,8 @@ buildscript {
 allprojects {
 
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 

Source/Android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

Source/Android/luascriptcore/build.gradle

@@ -2,5 +2,5 @@ apply from: './compile.gradle'
 //apply from: './compile-5.1.5.gradle'    //lua 5.1.5 版本
 
 android {
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 }

Source/Android/luascriptcore/compile.gradle

@@ -1,23 +1,23 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '28.0.3'
     publishNonDefault true
 
     lintOptions {
         abortOnError false
     }
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 24
+        minSdkVersion 16
+        targetSdkVersion 26
         versionCode 20200
         versionName "2.3.1"
 
         ndk {
             moduleName "LuaScriptCore"
-            stl "gnustl_static"
+            stl "c++_static"
             ldLibs "log"
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"      //筛选只需要的架构，其中armeabi、mips、mips64已标记过时
         }
@@ -26,15 +26,14 @@ android {
 
             ndkBuild {
 
-                arguments "APP_STL=gnustl_static",
+                arguments "APP_STL=c++_static",
                         "NDK_DEBUG=1",
-                        "APP_PLATFORM=android-14",
-                        "NDK_TOOLCHAIN_VERSION=4.9"
+                        "APP_PLATFORM=android-16",
+                        "NDK_TOOLCHAIN_VERSION=clang"
 
                 cppFlags "-frtti",
                         "-fexceptions",
-                        "-std=gnu++11",
-                        "-Wno-format-contains-nul",
+                        "-std=c++11",
                         "-g",
                         "-Wno-deprecated-declarations",
                         "-fpermissive"
@@ -118,4 +117,4 @@ dependencies {
 }
 
 apply from: './installv1.gradle'
-apply from: './bintrayv1.gradle'
+apply from: './bintrayv1.gradle'