diff --git a/.node-version b/.node-version new file mode 100644 index 00000000..5692975b --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +16.19.1 \ No newline at end of file diff --git a/apps/skolplattformen-app/android/app/build.gradle b/apps/skolplattformen-app/android/app/build.gradle index 9ea1a1fc..551b2e1b 100644 --- a/apps/skolplattformen-app/android/app/build.gradle +++ b/apps/skolplattformen-app/android/app/build.gradle @@ -78,8 +78,17 @@ android { applicationId "com.oppna_skolplattformen_new.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 4 - versionName "1.0" + + versionCode 20000 + versionName "3.0.8" + } + splits { + abi { + reset() + enable enableSeparateBuildPerCPUArchitecture + universalApk false // If true, also generate a universal APK + include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" + } } signingConfigs { debug { diff --git a/apps/skolplattformen-app/android/build.gradle b/apps/skolplattformen-app/android/build.gradle index 34ea7181..c14230d6 100644 --- a/apps/skolplattformen-app/android/build.gradle +++ b/apps/skolplattformen-app/android/build.gradle @@ -6,9 +6,10 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 - + // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" + } repositories { google() diff --git a/apps/skolplattformen-app/ios/Podfile.lock b/apps/skolplattformen-app/ios/Podfile.lock index 4764324b..dd09f8e2 100644 --- a/apps/skolplattformen-app/ios/Podfile.lock +++ b/apps/skolplattformen-app/ios/Podfile.lock @@ -801,4 +801,5 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 65fac31507ce363c84c5ab1cb333c7f711468d6a + COCOAPODS: 1.12.1 diff --git a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj index fc536736..166d2ebf 100644 --- a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj +++ b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj @@ -306,6 +306,7 @@ showEnvVarsInLog = 0; }; C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -332,8 +333,10 @@ buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( @@ -488,11 +491,13 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_BITCODE = NO; INFOPLIST_FILE = app/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -514,11 +519,10 @@ CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = app/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; + + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + MARKETING_VERSION = 3.0.8; + OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 8c8d1c95..ea22aa30 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "react-native-simple-toast": "1.1.3", "react-native-svg": "12.1.1", "react-native-typography": "1.4.1", - "react-native-webview": "^11.15.0", + "react-native-webview": "^11.26.1", "react-redux": "^7.2.3", "redux": "^4.0.5", "regenerator-runtime": "^0.13.9", diff --git a/yarn.lock b/yarn.lock index e514f226..39e35e66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11132,10 +11132,10 @@ react-native-typography@1.4.1: resolved "https://registry.yarnpkg.com/react-native-typography/-/react-native-typography-1.4.1.tgz#2d05cb5935a2f7fdb6b43bbde93d60f1324578e3" integrity sha512-dc9Zfs4jUdq4ygx4/KwO6jKTERBu6cRrfPJGntw/pA+D6BMjlWfMNuhZ/69vf4Zpsnt9s4AGe+Z/V1QFYaCXAA== -react-native-webview@^11.15.0: - version "11.15.0" - resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-11.15.0.tgz#b5aea9da579ca17fb9fd324e5202b1b5b8ce9fa8" - integrity sha512-0Wv+8qu8XuACx1xZwzc2Yfl+rOvxUouLcPxUKdkhaMVNpwoM5/ePpczCQZ3LpiRnSoEtjaUkfyQHbJQ+x4dDJQ== +react-native-webview@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-12.4.0.tgz#421db8e5601b4851c5796c5d4736b6b8439d1469" + integrity sha512-wYzTfNADidmqv6bY+x6NUfX8+uBR9mmF1CO1NOvY4oD2vv+D4rA0XwcwAe2D7RevXUy3fmuTT93kFQcgo8fEhg== dependencies: escape-string-regexp "2.0.0" invariant "2.2.4"