Skip to content

Commit 1d1e1b9

Browse files
committed
1. 调整Android平台lua 5.1.5编译脚本的jni使用clang进行编译
2. 定版2.3.2
1 parent eaec03b commit 1d1e1b9

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

LuaScriptCore.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "LuaScriptCore"
19-
s.version = "2.3.1"
19+
s.version = "2.3.2"
2020
s.summary = "An easy-to-use OC-Lua bridge"
2121

2222
# This description is used to generate tags and improve search results.

Source/Android/luascriptcore/compile-5.1.5.gradle

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion '26.0.2'
4+
compileSdkVersion 26
5+
buildToolsVersion '28.0.3'
66
publishNonDefault true
77

88
lintOptions {
99
abortOnError false
1010
}
1111

1212
defaultConfig {
13-
minSdkVersion 14
14-
targetSdkVersion 24
15-
versionCode 20200
16-
versionName "2.3.1"
13+
minSdkVersion 16
14+
targetSdkVersion 26
15+
versionCode 20302
16+
versionName "2.3.2"
1717

1818
ndk {
1919
moduleName "LuaScriptCore"
20-
stl "gnustl_static"
20+
stl "c++_static"
2121
ldLibs "log"
2222
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" //筛选只需要的架构,其中armeabi、mips、mips64已标记过时
2323
}
@@ -26,14 +26,14 @@ android {
2626

2727
ndkBuild {
2828

29-
arguments "APP_STL=gnustl_static",
29+
arguments "APP_STL=c++_static",
3030
"NDK_DEBUG=1",
31-
"APP_PLATFORM=android-14",
32-
"NDK_TOOLCHAIN_VERSION=4.9"
31+
"APP_PLATFORM=android-16",
32+
"NDK_TOOLCHAIN_VERSION=clang"
33+
3334
cppFlags "-frtti",
3435
"-fexceptions",
35-
"-std=gnu++11",
36-
"-Wno-format-contains-nul",
36+
"-std=c++11",
3737
"-g",
3838
"-Wno-deprecated-declarations",
3939
"-fpermissive"
@@ -43,6 +43,7 @@ android {
4343
}
4444

4545
}
46+
4647
buildTypes {
4748
release {
4849
minifyEnabled false
@@ -51,7 +52,9 @@ android {
5152
debug {
5253
jniDebuggable true
5354
}
55+
5456
}
57+
5558
sourceSets {
5659
main {
5760

@@ -92,7 +95,7 @@ ext {
9295
siteUrl = 'https://github.com/vimfung/LuaScriptCore'
9396
gitUrl = 'https://github.com/vimfung/LuaScriptCore.git'
9497

95-
libraryVersion = '2.3.1'
98+
libraryVersion = '2.3.2'
9699

97100
developerId = 'vimfung'
98101
developerName = 'Vim Fung'

Source/Android/luascriptcore/compile.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ android {
1010
}
1111

1212
defaultConfig {
13+
1314
minSdkVersion 16
1415
targetSdkVersion 26
15-
versionCode 20200
16-
versionName "2.3.1"
16+
versionCode 20302
17+
versionName "2.3.2"
1718

1819
ndk {
1920
moduleName "LuaScriptCore"
@@ -99,7 +100,7 @@ ext {
99100
siteUrl = 'https://github.com/vimfung/LuaScriptCore'
100101
gitUrl = 'https://github.com/vimfung/LuaScriptCore.git'
101102

102-
libraryVersion = '2.3.1'
103+
libraryVersion = '2.3.2'
103104

104105
developerId = 'vimfung'
105106
developerName = 'Vim Fung'

0 commit comments

Comments
 (0)