Skip to content

Commit 1347b56

Browse files
vimfungvimfung
committed
调整版本号为1.3.5
Former-commit-id: 51148849187a0129495db1f82e91918f950f58d8
1 parent 2de1483 commit 1347b56

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+85
-58
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 = "1.3.4"
19+
s.version = "1.3.5"
2020
s.summary = "An easy-to-use OC-Lua bridge"
2121

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

‎Sample/Android/app/app.iml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,5 @@
123123
<orderEntry type="library" exported="" name="support-annotations-24.1.0" level="project" />
124124
<orderEntry type="library" exported="" name="animated-vector-drawable-24.1.0" level="project" />
125125
<orderEntry type="library" exported="" name="support-vector-drawable-24.1.0" level="project" />
126-
<orderEntry type="module" module-name="luascriptcore" exported="" />
127126
</component>
128127
</module>

‎Sample/Android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
compile fileTree(include: ['*.jar'], dir: 'libs')
2727
testCompile 'junit:junit:4.12'
2828
compile 'com.android.support:appcompat-v7:24.1.0'
29-
// compile 'com.github.vimfung.luascriptcore:luascriptcore:1.3.4'
29+
compile 'com.github.vimfung.luascriptcore:luascriptcore:1.3.5'
3030
// compile files('src/main/libs/LuaScriptCore.jar')
31-
compile project(':luascriptcore')
31+
// compile project(':luascriptcore')
3232
}

‎Sample/Android/settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include ':app'
22

3-
include 'luascriptcore'
4-
project(':luascriptcore').projectDir = new File(settingsDir, '../../Source/Android/luascriptcore')
3+
//include 'luascriptcore'
4+
//project(':luascriptcore').projectDir = new File(settingsDir, '../../Source/Android/luascriptcore')

‎Source/Android/luascriptcore/.externalNativeBuild/ndkBuild/debug/arm64-v8a/android_gradle_build.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk"
44
],
55
"cleanCommands": [
6-
"/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDEBUG\u003d1 APP_PLATFORM\u003dandroid-21 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 clean"
6+
"/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-21 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 clean"
77
],
88
"libraries": {
99
"LuaScriptCore-debug-arm64-v8a": {
10-
"buildCommand": "/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDEBUG\u003d1 APP_PLATFORM\u003dandroid-21 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 /Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libLuaScriptCore.so",
10+
"buildCommand": "/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-21 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 /Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libLuaScriptCore.so",
1111
"toolchain": "toolchain-arm64-v8a",
1212
"abi": "arm64-v8a",
1313
"artifactName": "LuaScriptCore",

‎Source/Android/luascriptcore/.externalNativeBuild/ndkBuild/debug/arm64-v8a/ndkBuild_build_command.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NDK_PROJECT_PATH=null
44
APP_BUILD_SCRIPT=/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk
55
APP_ABI=arm64-v8a
66
NDK_ALL_ABIS=arm64-v8a
7-
NDEBUG=1
7+
NDK_DEBUG=1
88
APP_PLATFORM=android-21
99
NDK_OUT=/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj
1010
NDK_LIBS_OUT=/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib
@@ -21,6 +21,7 @@ APP_PLATFORM=android-13
2121
NDK_TOOLCHAIN_VERSION=4.9
2222
APP_SHORT_COMMANDS=false
2323
LOCAL_SHORT_COMMANDS=false
24+
-B
2425
-n
2526
jvmArgs :
2627

‎Source/Android/luascriptcore/.externalNativeBuild/ndkBuild/debug/arm64-v8a/ndkBuild_build_output.txt‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎Source/Android/luascriptcore/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/android_gradle_build.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk"
44
],
55
"cleanCommands": [
6-
"/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 clean"
6+
"/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 clean"
77
],
88
"libraries": {
99
"LuaScriptCore-debug-armeabi-v7a": {
10-
"buildCommand": "/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 /Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libLuaScriptCore.so",
10+
"buildCommand": "/Users/vimfung/Library/Android/sdk/ndk-bundle/ndk-build NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk APP_ABI\u003darmeabi-v7a NDK_ALL_ABIS\u003darmeabi-v7a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003d/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib APP_CPPFLAGS+\u003d\"-frtti\" APP_CPPFLAGS+\u003d\"-fexceptions\" APP_CPPFLAGS+\u003d\"-std\u003dgnu++11\" APP_CPPFLAGS+\u003d\"-Wno-format-contains-nul\" APP_CPPFLAGS+\u003d\"-g\" APP_CPPFLAGS+\u003d\"-Wno-deprecated-declarations\" APP_CPPFLAGS+\u003d\"-fpermissive\" APP_STL\u003dstlport_static NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-13 NDK_TOOLCHAIN_VERSION\u003d4.9 /Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj/local/armeabi-v7a/libLuaScriptCore.so",
1111
"toolchain": "toolchain-armeabi-v7a",
1212
"abi": "armeabi-v7a",
1313
"artifactName": "LuaScriptCore",

‎Source/Android/luascriptcore/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_command.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NDK_PROJECT_PATH=null
44
APP_BUILD_SCRIPT=/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/src/main/jni/Android.mk
55
APP_ABI=armeabi-v7a
66
NDK_ALL_ABIS=armeabi-v7a
7-
NDEBUG=1
7+
NDK_DEBUG=1
88
APP_PLATFORM=android-13
99
NDK_OUT=/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/obj
1010
NDK_LIBS_OUT=/Users/vimfung/Documents/project/LuaScriptCore/Source/Android/luascriptcore/build/intermediates/ndkBuild/debug/lib
@@ -21,6 +21,7 @@ APP_PLATFORM=android-13
2121
NDK_TOOLCHAIN_VERSION=4.9
2222
APP_SHORT_COMMANDS=false
2323
LOCAL_SHORT_COMMANDS=false
24+
-B
2425
-n
2526
jvmArgs :
2627

‎Source/Android/luascriptcore/.externalNativeBuild/ndkBuild/debug/armeabi-v7a/ndkBuild_build_output.txt‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)