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
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ android {
applicationId "com.mendix.developerapp.mx10"
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 513
versionName "5.0.2"
versionCode 514
versionName "10.24.0"
missingDimensionStrategy "react-native-camera", "general"
testBuildType System.getProperty("testBuildType", "debug")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
11 changes: 2 additions & 9 deletions android/app/src/main/assets/sample_apps.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"id": "lato_bikes_app",
"name": "Lato Bikes",
"description": "Control your Lato Bike via your device",
"runtimeUrl": "https://lato-bicycles.mendixcloud.com",
"runtimeUrl": "https://customer.lato-bicycles.com",
"backgroundImageName": "lato_bikes_app"
},
{
Expand All @@ -42,13 +42,6 @@
"description": "Showcases Atlas 3",
"runtimeUrl": "https://atlasdesignsystem.mendixcloud.com",
"backgroundImageName": "atlas_ref_app"
},
{
"id": "mendix_ar",
"name": "Mendix AR",
"description": "Showcases possible Mendix AR applications",
"runtimeUrl": "https://ar-examples-2.mendixcloud.com",
"backgroundImageName": "ar_app"
}
]
}
}
Binary file modified android/app/src/main/assets/sampleapps.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Make It Native 10</string>
<string name="app_name">Make It Native</string>
</resources>
2 changes: 1 addition & 1 deletion ios/DeveloperApp/Config/DeveloperApp.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Identity
APP_DISPLAY_NAME = Make It Native 10
APP_DISPLAY_NAME = Make It Native
BUNDLE_IDENTIFIER = com.mendix.developerapp.native.mx10

CALENDARS_USAGE_DESCRIPTION = 'This app requires access to the calendar'
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/DeveloperApp/SampleApps/Bundles/banking_app/index.bundle
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
2,373 changes: 0 additions & 2,373 deletions ios/DeveloperApp/SampleApps/Bundles/mendix_ar/index.bundle

This file was deleted.

Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file not shown.
11 changes: 2 additions & 9 deletions ios/DeveloperApp/SampleApps/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"id": "lato_bikes_app",
"name": "Lato Bikes",
"description": "Control your Lato Bike via your device",
"runtimeUrl": "https://lato-bicycles.mendixcloud.com",
"runtimeUrl": "https://customer.lato-bicycles.com",
"backgroundImageName": "lato_bikes_app"
},
{
Expand All @@ -41,13 +41,6 @@
"description": "Showcases Atlas 3",
"runtimeUrl": "https://atlasdesignsystem.mendixcloud.com",
"backgroundImageName": "atlas_ref_app"
},
{
"id": "mendix_ar",
"name": "Mendix AR",
"description": "Showcases possible Mendix AR applications",
"runtimeUrl": "https://ar-examples-2.mendixcloud.com",
"backgroundImageName": "ar_app"
}
]
}
}
6 changes: 0 additions & 6 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1393,8 +1393,6 @@ PODS:
- React-jsiexecutor
- React-RCTFBReactNativeSpec
- ReactCommon/turbomodule/core
- react-native-babylon (1.6.3):
- React
- react-native-ble-plx (2.0.3):
- MultiplatformBleAdapter (= 0.1.9)
- React-Core
Expand Down Expand Up @@ -2146,7 +2144,6 @@ DEPENDENCIES:
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
- React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
- "react-native-babylon (from `../node_modules/@babylonjs/react-native-iosandroid-0-71`)"
- react-native-ble-plx (from `../node_modules/react-native-ble-plx`)
- react-native-blob-util (from `../node_modules/react-native-blob-util`)
- react-native-camera (from `../node_modules/react-native-camera`)
Expand Down Expand Up @@ -2325,8 +2322,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon"
React-microtasksnativemodule:
:path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
react-native-babylon:
:path: "../node_modules/@babylonjs/react-native-iosandroid-0-71"
react-native-ble-plx:
:path: "../node_modules/react-native-ble-plx"
react-native-blob-util:
Expand Down Expand Up @@ -2529,7 +2524,6 @@ SPEC CHECKSUMS:
React-logger: 1935d6e6461e9c8be4c87af56c56a4876021171e
React-Mapbuffer: 212171f037e3b22e6c2df839aa826806da480b85
React-microtasksnativemodule: 72564d5469003687d39bfc4efad281df8efc0684
react-native-babylon: 2c349f0fd849b41d88587e88ee343c32cb7db0f8
react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
react-native-blob-util: 64a732c0b8bb7f4928905e16ea8dc5cde6fb4832
react-native-camera: 35854c4f764a4a6cf61c1c3525888b92f0fe4b31
Expand Down
18 changes: 9 additions & 9 deletions ios/developerapp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@
CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 513;
CURRENT_PROJECT_VERSION = 514;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = BC32QNM6AD;
ENABLE_BITCODE = NO;
Expand All @@ -782,7 +782,7 @@
"${SRCROOT}/../node_modules/@mendix/native/ios/**",
);
INFOPLIST_FILE = DeveloperApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Make It Native 10";
INFOPLIST_KEY_CFBundleDisplayName = "Make It Native";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -795,7 +795,7 @@
"$(PROJECT_DIR)",
"${SRCROOT}/../node_modules/@mendix/native/ios",
);
MARKETING_VERSION = 5.0.2;
MARKETING_VERSION = 10.24.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -824,7 +824,7 @@
CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 513;
CURRENT_PROJECT_VERSION = 514;
DEVELOPMENT_TEAM = BC32QNM6AD;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = YES;
Expand All @@ -847,7 +847,7 @@
"${SRCROOT}/../node_modules/@mendix/native/ios/**",
);
INFOPLIST_FILE = DeveloperApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Make It Native 10";
INFOPLIST_KEY_CFBundleDisplayName = "Make It Native";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -860,7 +860,7 @@
"$(PROJECT_DIR)",
"${SRCROOT}/../node_modules/@mendix/native/ios",
);
MARKETING_VERSION = 5.0.2;
MARKETING_VERSION = 10.24.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1084,7 +1084,7 @@
CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 513;
CURRENT_PROJECT_VERSION = 514;
DEVELOPMENT_TEAM = BC32QNM6AD;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = YES;
Expand Down Expand Up @@ -1112,7 +1112,7 @@
"${SRCROOT}/../node_modules/@mendix/native/ios/**",
);
INFOPLIST_FILE = DeveloperApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Make It Native 10";
INFOPLIST_KEY_CFBundleDisplayName = "Make It Native";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
IPHONEOS_DEPLOYMENT_TARGET = 15.5;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -1125,7 +1125,7 @@
"$(PROJECT_DIR)",
"${SRCROOT}/../node_modules/@mendix/native/ios",
);
MARKETING_VERSION = 5.0.2;
MARKETING_VERSION = 10.24.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion ios/fastlane/metadata/en-US/name.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Make It Native 9
Make It Native
76 changes: 0 additions & 76 deletions package-lock.json

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

4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
"snyk:android": "cd android && snyk monitor --gradle-sub-project=app --configuration-attributes='com.android.build.api.attributes.BuildTypeAttr:release,react-native-camera:general,org.jetbrains.kotlin.platform.type:androidJvm' --configuration-matching='compile|implementation' --org=appdev --project-name=developerapp-android${SNYK_SUBPROJECT}"
},
"dependencies": {
"@babylonjs/core": "6.8.1",
"@babylonjs/loaders": "6.8.1",
"@babylonjs/react-native": "1.6.3",
"@babylonjs/react-native-iosandroid-0-71": "1.6.3",
"@mendix/native": "9.0.6",
"@op-engineering/op-sqlite": "9.2.7",
"@gorhom/bottom-sheet": "^5.1.1",
Expand Down