[go: nahoru, domu]
Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Merge 0.26 #2685

Merged
merged 3 commits into from
Jul 11, 2019
Merged

Merge 0.26 #2685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b0a1c3
Remove invalid header usage which will cause iOS build failure.
Jul 11, 2019
e72f798
Update default podspec file.
Jul 11, 2019
e2a73f6
Add missing but required files to iOS WeexSDK project.
Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions WeexSDK.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Pod::Spec.new do |s|

s.name = "WeexSDK"

s.version = "0.24.0"
s.version = "0.26.0"

s.summary = "WeexSDK Source."

Expand Down Expand Up @@ -50,7 +50,8 @@ Pod::Spec.new do |s|
'weex_core/Source/base/android',
'weex_core/Source/base/base64',
'weex_core/Source/base/crash',
'weex_core/Source/base/utils',
'weex_core/Source/base/utils/Compatible.cpp',
'weex_core/Source/base/utils/ThreadLocker.cpp',
'weex_core/Source/third_party/IPC',
'weex_core/Source/core/network/android/',
'weex_core/Source/include/JavaScriptCore/',
Expand All @@ -75,7 +76,7 @@ Pod::Spec.new do |s|
'ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.h',
'ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h',
'ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.h',
'ios/sdk/WeexSDK/Sources/Handler/WXNavigationDefaultImpl.h',
'ios/sdk/WeexSDK/Sources/Handler/WXNavigationDefaultImpl.h',
'ios/sdk/WeexSDK/Sources/View/WXView.h',
'ios/sdk/WeexSDK/Sources/View/WXErrorView.h',
'ios/sdk/WeexSDK/Sources/Protocol/*.h',
Expand Down Expand Up @@ -130,4 +131,4 @@ Pod::Spec.new do |s|

s.libraries = 'c++'

end
end
32 changes: 32 additions & 0 deletions ios/sdk/WeexSDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,14 @@
D362F9501C83EDA20003F546 /* WXWebViewModule.m in Sources */ = {isa = PBXBuildFile; fileRef = D362F94E1C83EDA20003F546 /* WXWebViewModule.m */; };
D3FC0DF71C508B2A002B9E31 /* WXTimerModule.h in Headers */ = {isa = PBXBuildFile; fileRef = D3FC0DF51C508B2A002B9E31 /* WXTimerModule.h */; };
D3FC0DF81C508B2A002B9E31 /* WXTimerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = D3FC0DF61C508B2A002B9E31 /* WXTimerModule.m */; };
D735F1A622D761F000B53CDF /* action_args_check.h in Headers */ = {isa = PBXBuildFile; fileRef = D735F1A422D761F000B53CDF /* action_args_check.h */; };
D735F1A722D761F000B53CDF /* action_args_check.h in Headers */ = {isa = PBXBuildFile; fileRef = D735F1A422D761F000B53CDF /* action_args_check.h */; };
D735F1A822D761F000B53CDF /* action_args_check.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D735F1A522D761F000B53CDF /* action_args_check.cpp */; };
D735F1A922D761F000B53CDF /* action_args_check.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D735F1A522D761F000B53CDF /* action_args_check.cpp */; };
D735F1B022D761F800B53CDF /* log_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = D735F1AB22D761F800B53CDF /* log_utils.h */; };
D735F1B122D761F800B53CDF /* log_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = D735F1AB22D761F800B53CDF /* log_utils.h */; };
D735F1B222D761F800B53CDF /* log_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D735F1AC22D761F800B53CDF /* log_utils.cpp */; };
D735F1B322D761F800B53CDF /* log_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D735F1AC22D761F800B53CDF /* log_utils.cpp */; };
D77286FF22C9B22C00E1DA7D /* eagle_bridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD9205FA223651D800EDF93D /* eagle_bridge.cpp */; };
DC03ADB91D508719003F76E7 /* WXTextAreaComponent.mm in Sources */ = {isa = PBXBuildFile; fileRef = DC03ADB71D508719003F76E7 /* WXTextAreaComponent.mm */; };
DC03ADBA1D508719003F76E7 /* WXTextAreaComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = DC03ADB81D508719003F76E7 /* WXTextAreaComponent.h */; };
Expand Down Expand Up @@ -1315,6 +1323,10 @@
D362F94E1C83EDA20003F546 /* WXWebViewModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXWebViewModule.m; sourceTree = "<group>"; };
D3FC0DF51C508B2A002B9E31 /* WXTimerModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXTimerModule.h; sourceTree = "<group>"; };
D3FC0DF61C508B2A002B9E31 /* WXTimerModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXTimerModule.m; sourceTree = "<group>"; };
D735F1A422D761F000B53CDF /* action_args_check.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = action_args_check.h; sourceTree = "<group>"; };
D735F1A522D761F000B53CDF /* action_args_check.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = action_args_check.cpp; sourceTree = "<group>"; };
D735F1AB22D761F800B53CDF /* log_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log_utils.h; sourceTree = "<group>"; };
D735F1AC22D761F800B53CDF /* log_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log_utils.cpp; sourceTree = "<group>"; };
DAB176F008F516E4F9391C61 /* libPods-WeexSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WeexSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; };
DC03ADB71D508719003F76E7 /* WXTextAreaComponent.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WXTextAreaComponent.mm; sourceTree = "<group>"; };
DC03ADB81D508719003F76E7 /* WXTextAreaComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXTextAreaComponent.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2240,6 +2252,8 @@
B8D66B722125572F003960BD /* parser */ = {
isa = PBXGroup;
children = (
D735F1A522D761F000B53CDF /* action_args_check.cpp */,
D735F1A422D761F000B53CDF /* action_args_check.h */,
B8D66B732125572F003960BD /* dom_wson.h */,
B8D66B742125572F003960BD /* dom_wson.cpp */,
);
Expand Down Expand Up @@ -2299,6 +2313,7 @@
B8D66B872125572F003960BD /* base */ = {
isa = PBXGroup;
children = (
D735F1AA22D761F800B53CDF /* utils */,
77E349F6229FE67900B1CDAB /* log_defines.cpp */,
77CF6A5421E6E47D00BA8634 /* core_constants.h */,
77CF6A5521E6E47D00BA8634 /* log_defines.h */,
Expand Down Expand Up @@ -2328,6 +2343,15 @@
path = WebSocket;
sourceTree = "<group>";
};
D735F1AA22D761F800B53CDF /* utils */ = {
isa = PBXGroup;
children = (
D735F1AB22D761F800B53CDF /* log_utils.h */,
D735F1AC22D761F800B53CDF /* log_utils.cpp */,
);
path = utils;
sourceTree = "<group>";
};
DC9F46841D61AC9100A88239 /* module */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2434,6 +2458,7 @@
B8D66C2F21255730003960BD /* render_action_render_success.h in Headers */,
C4D872221E5DDEDA00E39BC1 /* WXInnerLayer.h in Headers */,
B8D66C5121255730003960BD /* render_action_remove_event.h in Headers */,
D735F1A622D761F000B53CDF /* action_args_check.h in Headers */,
37B51EE41E97804D0040A743 /* WXCycleSliderComponent.h in Headers */,
77D161281C02DE1A0010B15B /* WXSDKManager.h in Headers */,
59CE27E81CC387DB000BE37A /* WXEmbedComponent.h in Headers */,
Expand Down Expand Up @@ -2544,6 +2569,7 @@
59A596241CB6311F0012CD52 /* WXStorageModule.h in Headers */,
74A4BA851CAD453400195969 /* WXNetworkProtocol.h in Headers */,
7461F8A81CFC33A800F62D44 /* WXThreadSafeMutableArray.h in Headers */,
D735F1B022D761F800B53CDF /* log_utils.h in Headers */,
453F3759219A76CA00A03F1D /* request_handler.h in Headers */,
D33451081D3E19480083598A /* WXCanvasComponent.h in Headers */,
17036A4E20FDE72F0029AE3D /* WXApmForInstance.h in Headers */,
Expand Down Expand Up @@ -2675,6 +2701,7 @@
DCA445A41EFA570E00D0CFA8 /* WXSDKInstance.h in Headers */,
DCA445C51EFA57E800D0CFA8 /* WXAComponent.h in Headers */,
B8D66C4A21255730003960BD /* render_action_interface.h in Headers */,
D735F1A722D761F000B53CDF /* action_args_check.h in Headers */,
B8D66C002125572F003960BD /* constants_name.h in Headers */,
DCA445B11EFA576800D0CFA8 /* WXLog.h in Headers */,
DCA4459D1EFA56DB00D0CFA8 /* WXValidateProtocol.h in Headers */,
Expand Down Expand Up @@ -2785,6 +2812,7 @@
DCA446111EFA5A8800D0CFA8 /* WXModuleMethod.h in Headers */,
DCA446011EFA5A4B00D0CFA8 /* WXTimerModule.h in Headers */,
B8D66C1A21255730003960BD /* measure_func_adapter.h in Headers */,
D735F1B122D761F800B53CDF /* log_utils.h in Headers */,
DCA446001EFA5A4800D0CFA8 /* WXDomModule.h in Headers */,
DCA446021EFA5A5000D0CFA8 /* WXWebViewModule.h in Headers */,
77788B722229252D000D5102 /* render_page_custom.h in Headers */,
Expand Down Expand Up @@ -3109,6 +3137,7 @@
77D161311C02DE4E0010B15B /* WXComponent.mm in Sources */,
74CFDD461F459443007A1A66 /* WXRecycleListUpdateManager.m in Sources */,
74862F7A1E02B88D00B7A041 /* JSValue+Weex.m in Sources */,
D735F1A822D761F000B53CDF /* action_args_check.cpp in Sources */,
33CE19102153443000CF9670 /* WXJSFrameworkLoadDefaultImpl.m in Sources */,
B8D66C7321255730003960BD /* render_list.cpp in Sources */,
740451EB1E14BB26004157CB /* WXServiceFactory.m in Sources */,
Expand Down Expand Up @@ -3213,6 +3242,7 @@
59A596301CB632050012CD52 /* WXBaseViewController.m in Sources */,
74CC7A211C2BF9DC00829368 /* WXListComponent.mm in Sources */,
7423899C1C3174EB00D748CA /* WXWeakObjectWrapper.m in Sources */,
D735F1B222D761F800B53CDF /* log_utils.cpp in Sources */,
744BEA561D05178F00452B5D /* WXComponent+Display.m in Sources */,
7408C48F1CFB345D000BCCD0 /* WXComponent+Events.m in Sources */,
B89543F320EB18B5006EAD63 /* WXCoreBridge.mm in Sources */,
Expand Down Expand Up @@ -3294,6 +3324,7 @@
74B81AE41F73C3E500D3A61D /* WXRecycleListComponent.mm in Sources */,
B8D66C6421255730003960BD /* render_text.cpp in Sources */,
7704894B22AA358500E7606F /* WXConsoleLogModule.m in Sources */,
D735F1A922D761F000B53CDF /* action_args_check.cpp in Sources */,
DC7764951F3C685200B5727E /* WXRecyclerDragController.m in Sources */,
B89543F420EB18B5006EAD63 /* WXCoreBridge.mm in Sources */,
DCA4453D1EFA55B300D0CFA8 /* WXRootView.m in Sources */,
Expand Down Expand Up @@ -3398,6 +3429,7 @@
DCA4457A1EFA55B300D0CFA8 /* WXSimulatorShortcutManager.m in Sources */,
DCA4457B1EFA55B300D0CFA8 /* WXAssert.m in Sources */,
ED053503207F4DEB007B4568 /* JSContext+Weex.m in Sources */,
D735F1B322D761F800B53CDF /* log_utils.cpp in Sources */,
DCA4457C1EFA55B300D0CFA8 /* WXAppConfiguration.m in Sources */,
DCA4457D1EFA55B300D0CFA8 /* WXThreadSafeMutableDictionary.m in Sources */,
DCA4457E1EFA55B300D0CFA8 /* WXThreadSafeMutableArray.m in Sources */,
Expand Down
1 change: 0 additions & 1 deletion weex_core/Source/core/parser/dom_wson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "wson/wson.h"
#include "wson/wson_parser.h"
//#ifdef test_log
#include "base/utils/log_utils.h"
#include "core/config/core_environment.h"
//#else
//#define LOGW
Expand Down