Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ platform :ios, deployment_target

prepare_react_native_project!
generate_mendix_delegate
setupInfoDevPlist

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Expand Down
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2538,11 +2538,11 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
FBLazyVector: e32d34492c519a2194ec9d7f5e7a79d11b73f91c
fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
hermes-engine: 2771b98fb813fdc6f92edd7c9c0035ecabf9fee7
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
Expand Down Expand Up @@ -2636,6 +2636,6 @@ SPEC CHECKSUMS:
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
Yoga: e14bad835e12b6c7e2260fc320bd00e0f4b45add

PODFILE CHECKSUM: bd6c88a4c9599e978dc53573bb32d0ff5fe3a42f
PODFILE CHECKSUM: 532b439839464076449499a1a589dce62fdeb5e5

COCOAPODS: 1.16.2
19 changes: 19 additions & 0 deletions ios/mendix_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,22 @@ def include_script_phases(phases)
def get_excluded_capabilities
["nativeOTA"]
end

def setupInfoDevPlist
source_plist = "nativeTemplate/Info.plist"
dest_plist = "nativeTemplate/Info-dev.plist"

# Read the source plist as text
content = File.read(source_plist)

# Replace <key>NSAllowsLocalNetworking</key><false/> with <true/>
content.gsub!(
/(<key>NSAllowsLocalNetworking<\/key>\s*)<false\/>/,
'\1<true/>'
)

# Write back the modified content
File.open(dest_plist, "w") do |file|
file << content
end
end
12 changes: 9 additions & 3 deletions ios/nativeTemplate.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
2C887FDA24B88A0E0003DC53 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C887FD924B88A0E0003DC53 /* LaunchScreen.storyboard */; };
2C887FDB24B88A0E0003DC53 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C887FD924B88A0E0003DC53 /* LaunchScreen.storyboard */; };
572D87C4D9F46E7564D1FE09 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = DBB22F41E3AF5D95F9759402 /* PrivacyInfo.xcprivacy */; };
6E2A5EF72EE2F17800FB5359 /* Info-dev.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6E2A5EF62EE2F17800FB5359 /* Info-dev.plist */; };
6E2A5EF82EE2F17800FB5359 /* Info-dev.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6E2A5EF62EE2F17800FB5359 /* Info-dev.plist */; };
9DF4091425A46A56E2A9A405 /* libPods-nativeTemplate.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73F36AC2CCD37CCD4E7B1BB8 /* libPods-nativeTemplate.a */; };
9E9B12F82EAB8BA500714B41 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B12F62EAB8BA500714B41 /* AppDelegate.swift */; };
9E9B12FA2EAB8C2800714B41 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E9B12F92EAB8C2800714B41 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -70,6 +72,7 @@
4D55DFFF6D52DC368FE13A23 /* Pods-nativeTemplate.releasedevapp.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-nativeTemplate.releasedevapp.xcconfig"; path = "Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.releasedevapp.xcconfig"; sourceTree = "<group>"; };
64F8A8A81DAAF68662AD5926 /* Pods-nativeTemplate.releasedevapp.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-nativeTemplate.releasedevapp.xcconfig"; path = "Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.releasedevapp.xcconfig"; sourceTree = "<group>"; };
6ABE4BDB54D431090249D8EC /* Pods-dev.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dev.release.xcconfig"; path = "Target Support Files/Pods-dev/Pods-dev.release.xcconfig"; sourceTree = "<group>"; };
6E2A5EF62EE2F17800FB5359 /* Info-dev.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-dev.plist"; path = "nativeTemplate/Info-dev.plist"; sourceTree = "<group>"; };
73F36AC2CCD37CCD4E7B1BB8 /* libPods-nativeTemplate.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-nativeTemplate.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7EEDF4024CB6865C31DBA5BB /* Pods-nativeTemplate.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-nativeTemplate.release.xcconfig"; path = "Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.release.xcconfig"; sourceTree = "<group>"; };
9A27E05F0AD54B417B79E303 /* Pods-dev.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dev.debug.xcconfig"; path = "Target Support Files/Pods-dev/Pods-dev.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -133,6 +136,7 @@
EBC80A5F22DF41DD007E5F3D /* Config */,
13B07FB51A68108700A75B9A /* Images.xcassets */,
13B07FB61A68108700A75B9A /* Info.plist */,
6E2A5EF62EE2F17800FB5359 /* Info-dev.plist */,
2C887FD924B88A0E0003DC53 /* LaunchScreen.storyboard */,
2C005A7823D5B1E200003E29 /* nativeTemplate.entitlements */,
9E9B12F62EAB8BA500714B41 /* AppDelegate.swift */,
Expand Down Expand Up @@ -361,6 +365,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6E2A5EF82EE2F17800FB5359 /* Info-dev.plist in Resources */,
C5A009082BE291FE00F10EC1 /* PrivacyInfo.xcprivacy in Resources */,
2C887FDA24B88A0E0003DC53 /* LaunchScreen.storyboard in Resources */,
1A0B83DB22E09B2600EA1E51 /* Bundle in Resources */,
Expand All @@ -376,6 +381,7 @@
files = (
1A0B3AFD23992F8200388BF7 /* Images.xcassets in Resources */,
1A0B3AD32397E15800388BF7 /* MendixApp.storyboard in Resources */,
6E2A5EF72EE2F17800FB5359 /* Info-dev.plist in Resources */,
1A0B3AEF2399058B00388BF7 /* config.release.xcconfig in Resources */,
2C887FDB24B88A0E0003DC53 /* LaunchScreen.storyboard in Resources */,
1A0B3AD62397EA8500388BF7 /* glyphicons-halflings-regular.ttf in Resources */,
Expand Down Expand Up @@ -872,7 +878,7 @@
"$(inherited)",
"${SRCROOT}/../node_modules/@mendix/native/ios/**",
);
INFOPLIST_FILE = NativeTemplate/Info.plist;
INFOPLIST_FILE = "nativeTemplate/Info-dev.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -929,7 +935,7 @@
"$(inherited)",
"${SRCROOT}/../node_modules/@mendix/native/ios/**",
);
INFOPLIST_FILE = NativeTemplate/Info.plist;
INFOPLIST_FILE = "nativeTemplate/Info-dev.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down Expand Up @@ -1133,7 +1139,7 @@
"$(inherited)",
"${SRCROOT}/../node_modules/@mendix/native/ios/**",
);
INFOPLIST_FILE = NativeTemplate/Info.plist;
INFOPLIST_FILE = "nativeTemplate/Info-dev.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
105 changes: 105 additions & 0 deletions ios/nativeTemplate/Info-dev.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?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>en</string>
<key>CFBundleDisplayName</key>
<string>$(BUNDLE_DISPLAY_NAME)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</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>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>GoogleMapsApiKey</key>
<string></string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>mailto</string>
<string>tel</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<false/>
<key>NSAllowsLocalNetworking</key>
<true/>
</dict>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>This app may need access to your Bluetooth connection</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>This app may need access to your Bluetooth connection</string>
<key>NSCalendarsUsageDescription</key>
<string>This app requires access to the calendar</string>
<key>NSCameraUsageDescription</key>
<string>The camera can be used to open apps by scanning a QR code.</string>
<key>NSFaceIDUsageDescription</key>
<string>Enabling Face ID allows you quick and secure access to your account.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSMicrophoneUsageDescription</key>
<string>To use that feature the app needs access to your microphone.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>To use that feature the app needs access to your photo library.</string>
<key>Runtime url</key>
<string>$(RUNTIME_URL)</string>
<key>TargetName</key>
<string>${TARGET_NAME}</string>
<key>UIAppFonts</key>
<array>
<string>glyphicons-halflings-regular.ttf</string>
<string>AntDesign.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
<string>Fontisto.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>${MAIN_STORY_BOARD}</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
<key>UIRequiresFullScreen</key>
<false/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
</plist>
17 changes: 8 additions & 9 deletions ios/nativeTemplate/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>mailto</string>
<string>tel</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand All @@ -29,15 +24,19 @@
<string>1</string>
<key>GoogleMapsApiKey</key>
<string></string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>mailto</string>
<string>tel</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<!-- Do not change NSAllowsArbitraryLoads to true, or you will risk app rejection! -->
<key>NSAllowsArbitraryLoads</key>
<false/>
<key>NSAllowsLocalNetworking</key>
<true/>
<false/>
</dict>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>This app may need access to your Bluetooth connection</string>
Expand All @@ -49,12 +48,12 @@
<string>The camera can be used to open apps by scanning a QR code.</string>
<key>NSFaceIDUsageDescription</key>
<string>Enabling Face ID allows you quick and secure access to your account.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>To use that feature the app needs access to your location.</string>
<key>NSMicrophoneUsageDescription</key>
<string>To use that feature the app needs access to your microphone.</string>
<key>NSPhotoLibraryUsageDescription</key>
Expand Down