diff --git a/frontend/apps/mobile/Gemfile b/frontend/apps/mobile/Gemfile index 1fa2c2e1..85d7f682 100644 --- a/frontend/apps/mobile/Gemfile +++ b/frontend/apps/mobile/Gemfile @@ -3,4 +3,7 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version ruby ">= 2.6.10" -gem 'cocoapods', '~> 1.12' +# Exclude problematic versions of cocoapods and activesupport that causes build failures. +gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' +gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' +gem 'xcodeproj', '< 1.26.0' diff --git a/frontend/apps/mobile/android/app/build.gradle b/frontend/apps/mobile/android/app/build.gradle index 3beca65c..d4fa4768 100644 --- a/frontend/apps/mobile/android/app/build.gradle +++ b/frontend/apps/mobile/android/app/build.gradle @@ -8,13 +8,14 @@ apply plugin: "com.facebook.react" react { /* Folders */ // The root of your project, i.e. where "package.json" lives. Default is '..' - // root = file("../") - // The folder where the react-native NPM package is. Default is ../node_modules/react-native - // reactNativeDir = file("../node_modules/react-native") - // The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen - // codegenDir = file("../node_modules/@react-native/codegen") - // The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js - // cliFile = file("../node_modules/react-native/cli.js") + // The root of your project, i.e. where "package.json" lives. Default is '../..' + // root = file("../../") + // The folder where the react-native NPM package is. Default is ../../node_modules/react-native + // reactNativeDir = file("../../node_modules/react-native") + // The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen + // codegenDir = file("../../node_modules/@react-native/codegen") + // The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js + // cliFile = file("../../node_modules/react-native/cli.js") /* Variants */ // The list of variants to that are debuggable. For those we're going to @@ -48,6 +49,10 @@ react { // // The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map" // hermesFlags = ["-O", "-output-source-map"] + + /* Autolinking */ + autolinkLibrariesWithApp() + entryFile = file("../../src/main.tsx") } @@ -147,5 +152,3 @@ dependencies { // } apply from: file("../../node_modules/react-native-vector-icons/fonts.gradle"); -apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); -applyNativeModulesAppBuildGradle(project) diff --git a/frontend/apps/mobile/android/app/src/main/AndroidManifest.xml b/frontend/apps/mobile/android/app/src/main/AndroidManifest.xml index f9fabb24..4155aa96 100644 --- a/frontend/apps/mobile/android/app/src/main/AndroidManifest.xml +++ b/frontend/apps/mobile/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" - android:networkSecurityConfig="@xml/network_security_config"> + android:networkSecurityConfig="@xml/network_security_config" + android:supportsRtl="true"> /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/frontend/apps/mobile/android/gradlew.bat b/frontend/apps/mobile/android/gradlew.bat index 25da30db..9d21a218 100755 --- a/frontend/apps/mobile/android/gradlew.bat +++ b/frontend/apps/mobile/android/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/frontend/apps/mobile/android/settings.gradle b/frontend/apps/mobile/android/settings.gradle index 4b8c5aee..2932f158 100644 --- a/frontend/apps/mobile/android/settings.gradle +++ b/frontend/apps/mobile/android/settings.gradle @@ -1,4 +1,6 @@ +pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") } +plugins { id("com.facebook.react.settings") } +extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() } rootProject.name = 'Abrechnung' -apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/@react-native/gradle-plugin') diff --git a/frontend/apps/mobile/ios/Abrechnung/PrivacyInfo.xcprivacy b/frontend/apps/mobile/ios/Abrechnung/PrivacyInfo.xcprivacy index ef1896e7..15dbf054 100644 --- a/frontend/apps/mobile/ios/Abrechnung/PrivacyInfo.xcprivacy +++ b/frontend/apps/mobile/ios/Abrechnung/PrivacyInfo.xcprivacy @@ -2,8 +2,6 @@ - NSPrivacyCollectedDataTypes - NSPrivacyAccessedAPITypes @@ -32,6 +30,8 @@ + NSPrivacyCollectedDataTypes + NSPrivacyTracking diff --git a/frontend/nx.json b/frontend/nx.json index 7cccaabc..9ea4e624 100644 --- a/frontend/nx.json +++ b/frontend/nx.json @@ -1,6 +1,6 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", - "parallel": 8, + "parallel": 1, "pluginsConfig": { "@nx/js": { "analyzeSourceFiles": false