From 5d61cd150a4754518f01060cfecb4b6dbadde88b Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Wed, 11 Oct 2023 09:35:47 +0200 Subject: [PATCH 1/8] Update build.gradle --- apps/skolplattformen-app/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/skolplattformen-app/android/build.gradle b/apps/skolplattformen-app/android/build.gradle index ce281b99..2e1ecad9 100644 --- a/apps/skolplattformen-app/android/build.gradle +++ b/apps/skolplattformen-app/android/build.gradle @@ -4,8 +4,8 @@ buildscript { ext { buildToolsVersion = "30.0.2" minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + compileSdkVersion = 34 + targetSdkVersion = 34 ndkVersion = "21.4.7075529" kotlinVersion = "1.6.0" } From 4e51bb8de7eab0f0ea812c08e2749c7d8b1f927b Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Wed, 11 Oct 2023 10:15:25 +0200 Subject: [PATCH 2/8] Update build.gradle --- apps/skolplattformen-app/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/skolplattformen-app/android/build.gradle b/apps/skolplattformen-app/android/build.gradle index 2e1ecad9..7e44d442 100644 --- a/apps/skolplattformen-app/android/build.gradle +++ b/apps/skolplattformen-app/android/build.gradle @@ -4,8 +4,8 @@ buildscript { ext { buildToolsVersion = "30.0.2" minSdkVersion = 21 - compileSdkVersion = 34 - targetSdkVersion = 34 + compileSdkVersion = 33 + targetSdkVersion = 33 ndkVersion = "21.4.7075529" kotlinVersion = "1.6.0" } From c26b118ad0e683687faa46c14bd27ddadc1a8518 Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Wed, 11 Oct 2023 11:13:21 +0200 Subject: [PATCH 3/8] added .node-version --- .node-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .node-version 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 From 27e9fb8cf7b41cdc95da1193a4874e809a0d5c98 Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Thu, 12 Oct 2023 19:00:25 +0200 Subject: [PATCH 4/8] uppdated webview --- apps/skolplattformen-app/ios/Podfile.lock | 6 +++--- .../ios/app.xcodeproj/project.pbxproj | 12 ++++++------ package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/skolplattformen-app/ios/Podfile.lock b/apps/skolplattformen-app/ios/Podfile.lock index 3353bcb0..7e439c54 100644 --- a/apps/skolplattformen-app/ios/Podfile.lock +++ b/apps/skolplattformen-app/ios/Podfile.lock @@ -299,7 +299,7 @@ PODS: - react-native-simple-toast (1.1.3): - React-Core - Toast (~> 4.0.0) - - react-native-webview (11.15.0): + - react-native-webview (12.4.0): - React-Core - React-perflogger (0.66.4) - React-RCTActionSheet (0.66.4): @@ -617,7 +617,7 @@ SPEC CHECKSUMS: react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979 react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057 react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f - react-native-webview: e89bf2dba26a04cda967814df3ed1be99f291233 + react-native-webview: 65f1143983cfeaedf02fd25b2621d3f4a37075de React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd React-RCTActionSheet: 7d3041e6761b4f3044a37079ddcb156575fb6d89 React-RCTAnimation: 743e88b55ac62511ae5c2e22803d4f503f2a3a13 @@ -646,4 +646,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f4a92b32cc4938e15ad7ccfefe9898548670abed -COCOAPODS: 1.11.2 +COCOAPODS: 1.10.1 diff --git a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj index a7a6f4e1..5700a6a7 100644 --- a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj +++ b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj @@ -530,9 +530,9 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -610,9 +610,9 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( diff --git a/package.json b/package.json index 8c8d1c95..994f64c0 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": "^12.1.0", "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" From 6d9325c20c818f67737b5c1ebd09d1746212ce1b Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Thu, 12 Oct 2023 19:06:17 +0200 Subject: [PATCH 5/8] bumped version to 3.0.7 --- apps/skolplattformen-app/android/app/build.gradle | 2 +- apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/skolplattformen-app/android/app/build.gradle b/apps/skolplattformen-app/android/app/build.gradle index 564e2a27..86b9a643 100644 --- a/apps/skolplattformen-app/android/app/build.gradle +++ b/apps/skolplattformen-app/android/app/build.gradle @@ -139,7 +139,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 20000 - versionName "3.0.6" + versionName "3.0.7" } splits { abi { diff --git a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj index 5700a6a7..3cf2c3ee 100644 --- a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj +++ b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj @@ -794,7 +794,7 @@ ENABLE_BITCODE = NO; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.6; + MARKETING_VERSION = 3.0.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -823,7 +823,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.6; + MARKETING_VERSION = 3.0.7; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", From 4d3f94017134123357259490f297b6739a668660 Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Fri, 13 Oct 2023 08:38:25 +0200 Subject: [PATCH 6/8] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 994f64c0..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": "^12.1.0", + "react-native-webview": "^11.26.1", "react-redux": "^7.2.3", "redux": "^4.0.5", "regenerator-runtime": "^0.13.9", From b5a2943fbb15739fc64b63a47d67105495139de9 Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Fri, 13 Oct 2023 16:44:01 +0200 Subject: [PATCH 7/8] Update Podfile.lock --- apps/skolplattformen-app/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/skolplattformen-app/ios/Podfile.lock b/apps/skolplattformen-app/ios/Podfile.lock index 7e439c54..bff0c79c 100644 --- a/apps/skolplattformen-app/ios/Podfile.lock +++ b/apps/skolplattformen-app/ios/Podfile.lock @@ -646,4 +646,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f4a92b32cc4938e15ad7ccfefe9898548670abed -COCOAPODS: 1.10.1 +COCOAPODS: 1.12.0 From 09ae4f0eaaa1bdbbf6d7f51f433014857844abdb Mon Sep 17 00:00:00 2001 From: Kajetan Kazimierczak Date: Fri, 13 Oct 2023 19:09:38 +0200 Subject: [PATCH 8/8] Bumped version to 3.0.8 --- apps/skolplattformen-app/android/app/build.gradle | 2 +- apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/skolplattformen-app/android/app/build.gradle b/apps/skolplattformen-app/android/app/build.gradle index 86b9a643..2bf2de45 100644 --- a/apps/skolplattformen-app/android/app/build.gradle +++ b/apps/skolplattformen-app/android/app/build.gradle @@ -139,7 +139,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 20000 - versionName "3.0.7" + versionName "3.0.8" } splits { abi { diff --git a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj index 3cf2c3ee..c1e6edf5 100644 --- a/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj +++ b/apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj @@ -794,7 +794,7 @@ ENABLE_BITCODE = NO; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.7; + MARKETING_VERSION = 3.0.8; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -823,7 +823,7 @@ DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.0.7; + MARKETING_VERSION = 3.0.8; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC",