Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit a0ace41a by tianmin yan
Options

解决冲突

parents 22187e3e 37245333
Inline Side-by-side
Showing with 32 additions and 2 deletions
Module/GDFightTeamModule/GDFightTeamModule.xcodeproj/project.pbxproj
......@@ -64,6 +64,7 @@
BE6694FC2C47D98F00C1386C /* GDFightTeamZoneController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6694C12C47D98F00C1386C /* GDFightTeamZoneController.swift */; };
BE6694FD2C47D98F00C1386C /* GDFightTeamZoneViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE6694C32C47D98F00C1386C /* GDFightTeamZoneViewModel.swift */; };
BE6694FE2C47D9BA00C1386C /* GDFightTeamCreateController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE66946A2C47D98E00C1386C /* GDFightTeamCreateController.xib */; };
BED3D00C2C58955C0028E28F /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BED3D00B2C58955C0028E28F /* Info.plist */; };
BEDC2F4C2C46868900651C72 /* GDFightTeamModule.h in Headers */ = {isa = PBXBuildFile; fileRef = BEDC2F4B2C46868900651C72 /* GDFightTeamModule.h */; settings = {ATTRIBUTES = (Public, ); }; };
BEDC2F652C47759900651C72 /* GDFightTeamAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2F5A2C47759900651C72 /* GDFightTeamAPI.swift */; };
BEDC2F662C47759900651C72 /* GDFightTeamHttpHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEDC2F5B2C47759900651C72 /* GDFightTeamHttpHelper.swift */; };
......@@ -136,6 +137,7 @@
BE6694BF2C47D98F00C1386C /* GDFightTeamZoneMainView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GDFightTeamZoneMainView.swift; sourceTree = "<group>"; };
BE6694C12C47D98F00C1386C /* GDFightTeamZoneController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GDFightTeamZoneController.swift; sourceTree = "<group>"; };
BE6694C32C47D98F00C1386C /* GDFightTeamZoneViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GDFightTeamZoneViewModel.swift; sourceTree = "<group>"; };
BED3D00B2C58955C0028E28F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BEDC2F482C46868900651C72 /* GDFightTeamModule.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GDFightTeamModule.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BEDC2F4B2C46868900651C72 /* GDFightTeamModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GDFightTeamModule.h; sourceTree = "<group>"; };
BEDC2F562C46899400651C72 /* GDFightTeamBundle.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GDFightTeamBundle.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -659,6 +661,7 @@
isa = PBXGroup;
children = (
BEDC2F6E2C47762D00651C72 /* FightTeamAssets.xcassets */,
BED3D00B2C58955C0028E28F /* Info.plist */,
);
path = GDFightTeamBundle.bundle;
sourceTree = "<group>";
......@@ -772,6 +775,7 @@
files = (
BE6694FE2C47D9BA00C1386C /* GDFightTeamCreateController.xib in Resources */,
BEDC2F6F2C47762D00651C72 /* FightTeamAssets.xcassets in Resources */,
BED3D00C2C58955C0028E28F /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -1112,7 +1116,8 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = GDFightTeamModule/GDFightTeamBundle.bundle/Info.plist;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INFOPLIST_KEY_NSPrincipalClass = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
......@@ -1135,7 +1140,8 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
GENERATE_INFOPLIST_FILE = NO;
INFOPLIST_FILE = GDFightTeamModule/GDFightTeamBundle.bundle/Info.plist;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INFOPLIST_KEY_NSPrincipalClass = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
......
Module/GDFightTeamModule/GDFightTeamModule/GDFightTeamBundle.bundle/Info.plist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment