8000 修复iOS demo无法编译的问题 · pythonzz/LuaViewSDK@d5b48f5 · GitHub
[go: up one dir, main page]
Skip to content

Commit d5b48f5

Browse files
author
敛心
committed
修复iOS demo无法编译的问题
1 parent 90bcbdf commit d5b48f5

File tree

96 files changed

+2617
-9616
lines changed

Some content is hidden

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

96 files changed

+2617
-9616
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ xcuserdata/
88

99
# others
1010
.git_old_branch
11+
12+
# Pods
13+
TaobaoEnv
14+
IOS/Demo/Pods/*

‎IOS/Demo/Demo.xcodeproj/project.pbxproj

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -405,13 +405,13 @@
405405
isa = PBXNativeTarget;
406406
buildConfigurationList = 3CC2F83C1C706B1D00D1E0B7 /* Build configuration list for PBXNativeTarget "Demo" */;
407407
buildPhases = (
408-
BA60D6FA2A6DA2D2F59A7F13 /* Check Pods Manifest.lock */,
408+
BA60D6FA2A6DA2D2F59A7F13 /* [CP] Check Pods Manifest.lock */,
409409
3CC2F8161C706B1D00D1E0B7 /* Sources */,
410410
3CC2F8171C706B1D00D1E0B7 /* Frameworks */,
411411
3CC2F8181C706B1D00D1E0B7 /* Resources */,
412-
9FC0D3B176417E1FCCAA292F /* Embed Pods Frameworks */,
413-
38AA2395FB23F05E678F60BF /* Copy Pods Resources */,
414-
D6B095773A9CD1B2ED818FE5 /* Copy Framework Resources */,
412+
9FC0D3B176417E1FCCAA292F /* [CP] Embed Pods Frameworks */,
413+
38AA2395FB23F05E678F60BF /* [CP] Copy Pods Resources */,
414+
D6B095773A9CD1B2ED818FE5 /* [CP] Copy Framework Resources */,
415415
);
416416
buildRules = (
417417
);
@@ -566,59 +566,59 @@
566566
/* End PBXResourcesBuildPhase section */
567567

568568
/* Begin PBXShellScriptBuildPhase section */
569-
38AA2395FB23F05E678F60BF /* Copy Pods Resources */ = {
569+
38AA2395FB23F05E678F60BF /* [CP] Copy Pods Resources */ = {
570570
isa = PBXShellScriptBuildPhase;
571571
buildActionMask = 2147483647;
572572
files = (
573573
);
574574
inputPaths = (
575575
);
576-
name = "Copy Pods Resources";
576+
name = "[CP] Copy Pods Resources";
577577
outputPaths = (
578578
);
579579
runOnlyForDeploymentPostprocessing = 0;
580580
shellPath = /bin/sh;
581581
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
582582
showEnvVarsInLog = 0;
583583
};
584-
9FC0D3B176417E1FCCAA292F /* Embed Pods Frameworks */ = {
584+
9FC0D3B176417E1FCCAA292F /* [CP] Embed Pods Frameworks */ = {
585585
isa = PBXShellScriptBuildPhase;
586586
buildActionMask = 2147483647;
587587
files = (
588588
);
589589
inputPaths = (
590590
);
591-
name = "Embed Pods Frameworks";
591+
name = "[CP] Embed Pods Frameworks";
592592
outputPaths = (
593593
);
594594
runOnlyForDeploymentPostprocessing = 0;
595595
shellPath = /bin/sh;
596596
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
597597
showEnvVarsInLog = 0;
598598
};
599-
BA60D6FA2A6DA2D2F59A7F13 /* Check Pods Manifest.lock */ = {
599+
BA60D6FA2A6DA2D2F59A7F13 /* [CP] Check Pods Manifest.lock */ = {
600600
isa = PBXShellScriptBuildPhase;
601601
buildActionMask = 2147483647;
602602
files = (
603603
);
604604
inputPaths = (
605605
);
606-
name = "Check Pods Manifest.lock";
606+
name = "[CP] Check Pods Manifest.lock";
607607
outputPaths = (
608608
);
609609
runOnlyForDeploymentPostprocessing = 0;
610610
shellPath = /bin/sh;
611-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
611+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
612612
showEnvVarsInLog = 0;
613613
};
614-
D6B095773A9CD1B2ED818FE5 /* Copy Framework Resources */ = {
614+
D6B095773A9CD1B2ED818FE5 /* [CP] Copy Framework Resources */ = {
615615
isa = PBXShellScriptBuildPhase;
616616
buildActionMask = 2147483647;
617617
files = (
618618
);
619619
inputPaths = (
620620
);
621-
name = "Copy Framework Resources";
621+
name = "[CP] Copy Framework Resources";
622622
outputPaths = (
623623
);
624624
runOnlyForDeploymentPostprocessing = 0;
@@ -774,6 +774,7 @@
774774
CODE_SIGN_IDENTITY = "iPhone Developer";
775775
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
776776
DEVELOPMENT_TEAM = EAA28CVMQM;
777+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
777778
HEADER_SEARCH_PATHS = "$(SRCROOT)/../LuaViewSDK/Classes/**";
778779
INFOPLIST_FILE = Demo/Info.plist;
779780
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -793,6 +794,7 @@
793794
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
794795
DEVELOPMENT_TEAM = EAA28CVMQM;
795796
GCC_OPTIMIZATION_LEVEL = 3;
797+
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
796798
HEADER_SEARCH_PATHS = "$(SRCROOT)/../LuaViewSDK/Classes/**";
797799
INFOPLIST_FILE = Demo/Info.plist;
798800
IPHONEOS_DEPLOYMENT_TARGET = 8.0;

‎IOS/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",

‎IOS/Demo/Demo/ViewController.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ -(void) changeAllLuaFile{
109109
if( [path hasSuffix:@".lua"] ) {
110110
path = [NSString stringWithFormat:@"%@/%@", path0, path];
111111
NSData* data = [LVUtil dataReadFromFile:path];
112-
data = lv_toStandLuaGrammar(data);
113112
[LVUtil saveData:data toFile:path];
114113
}
115114
}

‎IOS/Demo/Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ target 'Demo' do
88
pod 'SDWebImage', '3.7.5'
99

1010
pod 'LuaViewSDK', :path => '../../'
11-
11+
pod 'liblua', :path => '../../'
12+
1213
end
1314

‎IOS/Demo/Podfile.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
PODS:
2-
- LuaViewSDK (0.5.0)
3-
- MJRefresh (3.1.0)
2+
- liblua (5.1.4)
3+
- LuaViewSDK (0.5.3)
4+
- MJRefresh (3.1.12)
45
- SDWebImage (3.7.5):
56
- SDWebImage/Core (= 3.7.5)
67
- SDWebImage/Core (3.7.5)
78

89
DEPENDENCIES:
10+
- liblua (from `../../`)
911
- LuaViewSDK (from `../../`)
1012
- MJRefresh
1113
- SDWebImage (= 3.7.5)
1214

1315
EXTERNAL SOURCES:
16+
liblua:
17+
:path: "../../"
1418
LuaViewSDK:
1519
:path: "../../"
1620

1721
SPEC CHECKSUMS:
18-
LuaViewSDK: 04f40a2b25e485669ca03ae93fd45f8a145164ce
19-
MJRefresh: 8bcd08c96987d3a9844eb431963d4510d77b8852
22+
liblua: cd63da7e611c6ebd3a5fd0fedf3292c97a131ebc
23+
LuaViewSDK: 7c3c3c801b4414f77fb40fa33ddecb1fade4cb6a
24+
MJRefresh: 11e1c9d86f2093ddcdbda7836bc2da477ddf568d
2025
SDWebImage: 033e39d6f389724696c4d790b4daffcb4395a9f6
2126

22-
COCOAPODS: 0.39.0
27+
PODFILE CHECKSUM: 5f143d80b3b293bb1cd8f5b6c8650799fd69b822
28+
29+
COCOAPODS: 1.2.0

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/LVGrammarChanger.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/LVWebView.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lapi.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lauxlib.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lcode.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/ldebug.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/ldo.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lfunc.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lgc.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/llex.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/llimits.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lmem.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lobject.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lopcodes.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lparser.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lstate.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lstring.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/ltable.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/ltm.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lua.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/luaconf.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lualib.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lundump.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lvm.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Private/LuaViewSDK/lzio.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/LVGrammarChanger.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/LVWebView.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lapi.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lauxlib.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lcode.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/ldebug.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/ldo.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lfunc.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lgc.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/llex.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/llimits.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lmem.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lobject.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lopcodes.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lparser.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lstate.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lstring.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/ltable.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/ltm.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lua.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/luaconf.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lualib.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lundump.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lvm.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Headers/Public/LuaViewSDK/lzio.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎IOS/Demo/Pods/Local Podspecs/LuaViewSDK.podspec.json

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎IOS/Demo/Pods/MJRefresh/MJRefresh/Base/MJRefreshAutoFooter.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎IOS/Demo/Pods/MJRefresh/MJRefresh/Base/MJRefreshAutoFooter.m

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0