Skip to content

Commit

Permalink
ios project fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulnagle
paulnagle committed Jan 7, 2024
1 parent 7d561b7 commit fbc25da
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 60 deletions.
3 changes: 3 additions & 0 deletions capacitor.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ const config: CapacitorConfig = {
appId: 'ie.nasouth.bmltsearch',
appName: 'BMLT Search',
webDir: 'www',
ios: {
scheme: 'BMLT Search'
},
server: {
androidScheme: 'https'
},
Expand Down
50 changes: 20 additions & 30 deletions ...App/BMLT Search.xcodeproj/project.pbxproj → ios/App/App.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
objects = {

/* Begin PBXBuildFile section */
226068E3CB5B8904CA10C3A0 /* Pods_BMLT_Search.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31E104FF3724C99C1BD340A1 /* Pods_BMLT_Search.framework */; };
2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
78C72CAA1EE5528BC364B0B7 /* Pods_BMLT_Search.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40DADF361F512D49C9AEE874 /* Pods_BMLT_Search.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0C23CB7545E51064477C4CC6 /* Pods-BMLT Search.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BMLT Search.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BMLT Search/Pods-BMLT Search.debug.xcconfig"; sourceTree = "<group>"; };
2D21D76C6F594C1B446151BF /* Pods-BMLT Search.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BMLT Search.release.xcconfig"; path = "Pods/Target Support Files/Pods-BMLT Search/Pods-BMLT Search.release.xcconfig"; sourceTree = "<group>"; };
1F2D2B09704CB869E6E484B4 /* Pods-BMLT Search.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BMLT Search.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BMLT Search/Pods-BMLT Search.debug.xcconfig"; sourceTree = "<group>"; };
2A57BCD3EECE150BF24656E9 /* Pods-BMLT Search.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BMLT Search.release.xcconfig"; path = "Pods/Target Support Files/Pods-BMLT Search/Pods-BMLT Search.release.xcconfig"; sourceTree = "<group>"; };
2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
40DADF361F512D49C9AEE874 /* Pods_BMLT_Search.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BMLT_Search.framework; sourceTree = BUILT_PRODUCTS_DIR; };
31E104FF3724C99C1BD340A1 /* Pods_BMLT_Search.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BMLT_Search.framework; sourceTree = BUILT_PRODUCTS_DIR; };
50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
504EC3041FED79650016851F /* BMLT Search.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BMLT Search.app"; sourceTree = BUILT_PRODUCTS_DIR; };
504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -39,7 +39,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
78C72CAA1EE5528BC364B0B7 /* Pods_BMLT_Search.framework in Frameworks */,
226068E3CB5B8904CA10C3A0 /* Pods_BMLT_Search.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -49,7 +49,7 @@
27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
isa = PBXGroup;
children = (
40DADF361F512D49C9AEE874 /* Pods_BMLT_Search.framework */,
31E104FF3724C99C1BD340A1 /* Pods_BMLT_Search.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -92,8 +92,8 @@
children = (
FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
0C23CB7545E51064477C4CC6 /* Pods-BMLT Search.debug.xcconfig */,
2D21D76C6F594C1B446151BF /* Pods-BMLT Search.release.xcconfig */,
1F2D2B09704CB869E6E484B4 /* Pods-BMLT Search.debug.xcconfig */,
2A57BCD3EECE150BF24656E9 /* Pods-BMLT Search.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -110,7 +110,7 @@
504EC3011FED79650016851F /* Frameworks */,
504EC3021FED79650016851F /* Resources */,
9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
7CFC8B5E6F172AE0C30ECC76 /* [CP] Copy Pods Resources */,
6F5620693250DC1E3BAFACF4 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -127,8 +127,8 @@
504EC2FC1FED79650016851F /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 920;
LastUpgradeCheck = 1420;
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 0920;
TargetAttributes = {
504EC3031FED79650016851F = {
CreatedOnToolsVersion = 9.2;
Expand All @@ -137,7 +137,7 @@
};
};
};
buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "BMLT Search" */;
buildConfigurationList = 504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */;
compatibilityVersion = "Xcode 8.0";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand Down Expand Up @@ -190,7 +190,7 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
7CFC8B5E6F172AE0C30ECC76 /* [CP] Copy Pods Resources */ = {
6F5620693250DC1E3BAFACF4 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -267,18 +267,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -327,18 +324,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -368,19 +362,17 @@
};
504EC3171FED79650016851F /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 0C23CB7545E51064477C4CC6 /* Pods-BMLT Search.debug.xcconfig */;
baseConfigurationReference = 1F2D2B09704CB869E6E484B4 /* Pods-BMLT Search.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.1.5;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = T3V4RRZHWV;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "BMLT Search";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 5.1.5;
MARKETING_VERSION = 5.0.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = ie.nasouth.bmltsearch;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -393,19 +385,17 @@
};
504EC3181FED79650016851F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2D21D76C6F594C1B446151BF /* Pods-BMLT Search.release.xcconfig */;
baseConfigurationReference = 2A57BCD3EECE150BF24656E9 /* Pods-BMLT Search.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.1.5;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = T3V4RRZHWV;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "BMLT Search";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 5.1.5;
MARKETING_VERSION = 5.0.0;
PRODUCT_BUNDLE_IDENTIFIER = ie.nasouth.bmltsearch;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -418,7 +408,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
504EC2FF1FED79650016851F /* Build configuration list for PBXProject "BMLT Search" */ = {
504EC2FF1FED79650016851F /* Build configuration list for PBXProject "App" */ = {
isa = XCConfigurationList;
buildConfigurations = (
504EC3141FED79650016851F /* Debug */,
Expand Down
0 ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ios/App/App.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions ios/App/App/Assets.xcassets/Splash.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"images": [
{
"filename": "Default@1x~universal~anyany.png",
"idiom": "universal",
"filename": "Default@1x~universal~anyany.png",
"scale": "1x"
},
{
"filename": "Default@2x~universal~anyany.png",
"idiom": "universal",
"filename": "Default@2x~universal~anyany.png",
"scale": "2x"
},
{
"filename": "Default@3x~universal~anyany.png",
"idiom": "universal",
"filename": "Default@3x~universal~anyany.png",
"scale": "3x"
}
],
"info": {
"author": "xcode",
"version": 1
"version": 1,
"author": "xcode"
}
}
Binary file removed ios/App/App/Assets.xcassets/Splash.imageset/Default@1x~universal~anyany 1.png
View file
Binary file not shown.
Binary file removed ios/App/App/Assets.xcassets/Splash.imageset/Default@2x~universal~anyany 1.png
View file
Binary file not shown.
Binary file removed ios/App/App/Assets.xcassets/Splash.imageset/Default@3x~universal~anyany 1.png
View file
Binary file not shown.
Binary file added ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ios/App/App/Assets.xcassets/Splash.imageset/splash-2732x2732.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 2 additions & 6 deletions ios/App/App/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,10 @@
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We use your location to find the distance to the nearest NA meeting.</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationAlwaysUsageDescription</key>
<string>We use your location to determine your distance from NA meetings.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We use your location to determine your distance from NA meetings.</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand Down
8 changes: 0 additions & 8 deletions ios/App/BMLT Search.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file

This file was deleted.

10 changes: 0 additions & 10 deletions ios/App/BMLT Search.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

0 comments on commit fbc25da

Please sign in to comment.