Skip to content

Commit

Permalink
chore: #14 Resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbqls200
dbqls200 committed Oct 17, 2024
1 parent 992c696 commit cecbc99
Show file tree
Hide file tree
Showing 11 changed files with 531 additions and 0 deletions.
196 changes: 196 additions & 0 deletions TMT/TMT.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,42 @@
D8D377E92CBE95C30043D103 /* BusSearchModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D377E82CBE95C30043D103 /* BusSearchModel.swift */; };
D8D377EB2CBE95CA0043D103 /* BusSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D377EA2CBE95CA0043D103 /* BusSearchViewModel.swift */; };
D8D377ED2CBE95D10043D103 /* BusSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D377EC2CBE95D10043D103 /* BusSearchView.swift */; };
D8D377E62CBE549F0043D103 /* BusStopData.csv in Resources */ = {isa = PBXBuildFile; fileRef = D8D377E52CBE549F0043D103 /* BusStopData.csv */; };
D8D3781F2CBEE7710043D103 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8D3781E2CBEE7710043D103 /* WidgetKit.framework */; };
D8D378212CBEE7710043D103 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8D378202CBEE7710043D103 /* SwiftUI.framework */; };
D8D378242CBEE7710043D103 /* TMTWidgetBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D378232CBEE7710043D103 /* TMTWidgetBundle.swift */; };
D8D378262CBEE7710043D103 /* TMTWidgetLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D378252CBEE7710043D103 /* TMTWidgetLiveActivity.swift */; };
D8D378282CBEE7710043D103 /* TMTWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D378272CBEE7710043D103 /* TMTWidget.swift */; };
D8D3782A2CBEE7710043D103 /* AppIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D378292CBEE7710043D103 /* AppIntent.swift */; };
D8D3782C2CBEE7720043D103 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8D3782B2CBEE7720043D103 /* Assets.xcassets */; };
D8D378302CBEE7720043D103 /* TMTWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D8D3781C2CBEE7710043D103 /* TMTWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
D8D378352CBEE81C0043D103 /* TMTWidgetLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D378252CBEE7710043D103 /* TMTWidgetLiveActivity.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
D8D3782E2CBEE7720043D103 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D86739612CA933CD00FFE8ED /* Project object */;
proxyType = 1;
remoteGlobalIDString = D8D3781B2CBEE7710043D103;
remoteInfo = TMTWidgetExtension;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
D8D378312CBEE7720043D103 /* Embed Foundation Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 13;
files = (
D8D378302CBEE7720043D103 /* TMTWidgetExtension.appex in Embed Foundation Extensions */,
);
name = "Embed Foundation Extensions";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
D844BCB42CC0AE770059E31F /* BusStopData.csv */ = {isa = PBXFileReference; lastKnownFileType = text; path = BusStopData.csv; sourceTree = "<group>"; };
5B6DA5B72CBE551400613ACB /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = "<group>"; };
Expand All @@ -31,6 +65,16 @@
D8D377E82CBE95C30043D103 /* BusSearchModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BusSearchModel.swift; sourceTree = "<group>"; };
D8D377EA2CBE95CA0043D103 /* BusSearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BusSearchViewModel.swift; sourceTree = "<group>"; };
D8D377EC2CBE95D10043D103 /* BusSearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BusSearchView.swift; sourceTree = "<group>"; };
D8D377E52CBE549F0043D103 /* BusStopData.csv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = BusStopData.csv; sourceTree = "<group>"; };
D8D3781C2CBEE7710043D103 /* TMTWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = TMTWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
D8D3781E2CBEE7710043D103 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
D8D378202CBEE7710043D103 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
D8D378232CBEE7710043D103 /* TMTWidgetBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TMTWidgetBundle.swift; sourceTree = "<group>"; };
D8D378252CBEE7710043D103 /* TMTWidgetLiveActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TMTWidgetLiveActivity.swift; sourceTree = "<group>"; };
D8D378272CBEE7710043D103 /* TMTWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TMTWidget.swift; sourceTree = "<group>"; };
D8D378292CBEE7710043D103 /* AppIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIntent.swift; sourceTree = "<group>"; };
D8D3782B2CBEE7720043D103 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D8D3782D2CBEE7720043D103 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -41,13 +85,24 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D8D378192CBEE7710043D103 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D8D378212CBEE7710043D103 /* SwiftUI.framework in Frameworks */,
D8D3781F2CBEE7710043D103 /* WidgetKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
D86739602CA933CD00FFE8ED = {
isa = PBXGroup;
children = (
D867396B2CA933CD00FFE8ED /* TMT */,
D8D378222CBEE7710043D103 /* TMTWidget */,
D8D3781D2CBEE7710043D103 /* Frameworks */,
D867396A2CA933CD00FFE8ED /* Products */,
);
sourceTree = "<group>";
Expand All @@ -56,6 +111,7 @@
isa = PBXGroup;
children = (
D86739692CA933CD00FFE8ED /* TMT.app */,
D8D3781C2CBEE7710043D103 /* TMTWidgetExtension.appex */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -99,6 +155,26 @@
D8D377EC2CBE95D10043D103 /* BusSearchView.swift */,
);
path = BusSearch;
D8D3781D2CBEE7710043D103 /* Frameworks */ = {
isa = PBXGroup;
children = (
D8D3781E2CBEE7710043D103 /* WidgetKit.framework */,
D8D378202CBEE7710043D103 /* SwiftUI.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
D8D378222CBEE7710043D103 /* TMTWidget */ = {
isa = PBXGroup;
children = (
D8D378232CBEE7710043D103 /* TMTWidgetBundle.swift */,
D8D378252CBEE7710043D103 /* TMTWidgetLiveActivity.swift */,
D8D378272CBEE7710043D103 /* TMTWidget.swift */,
D8D378292CBEE7710043D103 /* AppIntent.swift */,
D8D3782B2CBEE7720043D103 /* Assets.xcassets */,
D8D3782D2CBEE7720043D103 /* Info.plist */,
);
path = TMTWidget;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -111,16 +187,35 @@
D86739652CA933CD00FFE8ED /* Sources */,
D86739662CA933CD00FFE8ED /* Frameworks */,
D86739672CA933CD00FFE8ED /* Resources */,
D8D378312CBEE7720043D103 /* Embed Foundation Extensions */,
);
buildRules = (
);
dependencies = (
D8D3782F2CBEE7720043D103 /* PBXTargetDependency */,
);
name = TMT;
productName = TMT;
productReference = D86739692CA933CD00FFE8ED /* TMT.app */;
productType = "com.apple.product-type.application";
};
D8D3781B2CBEE7710043D103 /* TMTWidgetExtension */ = {
isa = PBXNativeTarget;
buildConfigurationList = D8D378342CBEE7720043D103 /* Build configuration list for PBXNativeTarget "TMTWidgetExtension" */;
buildPhases = (
D8D378182CBEE7710043D103 /* Sources */,
D8D378192CBEE7710043D103 /* Frameworks */,
D8D3781A2CBEE7710043D103 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = TMTWidgetExtension;
productName = TMTWidgetExtension;
productReference = D8D3781C2CBEE7710043D103 /* TMTWidgetExtension.appex */;
productType = "com.apple.product-type.app-extension";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -134,6 +229,9 @@
D86739682CA933CD00FFE8ED = {
CreatedOnToolsVersion = 15.4;
};
D8D3781B2CBEE7710043D103 = {
CreatedOnToolsVersion = 15.4;
};
};
};
buildConfigurationList = D86739642CA933CD00FFE8ED /* Build configuration list for PBXProject "TMT" */;
Expand All @@ -150,6 +248,7 @@
projectRoot = "";
targets = (
D86739682CA933CD00FFE8ED /* TMT */,
D8D3781B2CBEE7710043D103 /* TMTWidgetExtension */,
);
};
/* End PBXProject section */
Expand All @@ -165,6 +264,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D8D3781A2CBEE7710043D103 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D8D3782C2CBEE7720043D103 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -179,11 +286,31 @@
D867396D2CA933CD00FFE8ED /* TMTApp.swift in Sources */,
D8D377EB2CBE95CA0043D103 /* BusSearchViewModel.swift in Sources */,
D8D377ED2CBE95D10043D103 /* BusSearchView.swift in Sources */,
D8D378352CBEE81C0043D103 /* TMTWidgetLiveActivity.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D8D378182CBEE7710043D103 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D8D378282CBEE7710043D103 /* TMTWidget.swift in Sources */,
D8D3782A2CBEE7710043D103 /* AppIntent.swift in Sources */,
D8D378262CBEE7710043D103 /* TMTWidgetLiveActivity.swift in Sources */,
D8D378242CBEE7710043D103 /* TMTWidgetBundle.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
D8D3782F2CBEE7720043D103 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D8D3781B2CBEE7710043D103 /* TMTWidgetExtension */;
targetProxy = D8D3782E2CBEE7720043D103 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
D86739752CA933CE00FFE8ED /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down Expand Up @@ -307,6 +434,7 @@
D86739782CA933CE00FFE8ED /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
Expand All @@ -317,6 +445,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "We want your location haha";
INFOPLIST_KEY_NSSupportsLiveActivities = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand All @@ -339,6 +468,7 @@
D86739792CA933CE00FFE8ED /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
Expand All @@ -349,6 +479,7 @@
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "We want your location haha";
INFOPLIST_KEY_NSSupportsLiveActivities = YES;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand All @@ -368,6 +499,62 @@
};
name = Release;
};
D8D378322CBEE7720043D103 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 7P5S729LQZ;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = TMTWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TMTWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = twomanythinking.TMT.TMTWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
D8D378332CBEE7720043D103 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 7P5S729LQZ;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = TMTWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TMTWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = twomanythinking.TMT.TMTWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand All @@ -389,6 +576,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D8D378342CBEE7720043D103 /* Build configuration list for PBXNativeTarget "TMTWidgetExtension" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D8D378322CBEE7720043D103 /* Debug */,
D8D378332CBEE7720043D103 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = D86739612CA933CD00FFE8ED /* Project object */;
Expand Down
Loading

0 comments on commit cecbc99

Please sign in to comment.