Skip to content

Commit

Permalink
Merge pull request #432 from cultuurnet/develop
Browse files Browse the repository at this point in the history
Prepare release 2.1.0
  • Loading branch information
chennara authored Jul 19, 2024
2 parents 89826d5 + de12a69 commit 3a3616c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 21 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("com.google.gms:google-services:4.3.12")
classpath("com.google.android.gms:strict-version-matcher-plugin:1.2.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
}
}
Expand Down
10 changes: 6 additions & 4 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1219,9 +1219,11 @@ PODS:
- SnowplowTracker (4.1.0):
- FMDB (~> 2.7)
- SocketRocket (0.6.1)
- VisionCamera (3.9.0):
- React
- React-callinvoker
- VisionCamera (4.5.0):
- VisionCamera/Core (= 4.5.0)
- VisionCamera/React (= 4.5.0)
- VisionCamera/Core (4.5.0)
- VisionCamera/React (4.5.0):
- React-Core
- Yoga (1.14.0)

Expand Down Expand Up @@ -1613,7 +1615,7 @@ SPEC CHECKSUMS:
SimpleKeychain: f8707c8e97b38c6a6e687b17732afc9bcef06439
SnowplowTracker: 3f35a60dcb2cf9c4a56fa4cad46d5af6d1b5db44
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
VisionCamera: 7a5c87805b13adaaa557132b44879ed1e1e39786
VisionCamera: 412fec057156eb5fe84a44351e8ed71a072c1228
Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61

PODFILE CHECKSUM: 470ff2a7657f3afec9acd204c5cfa6bcc68b3a84
Expand Down
12 changes: 2 additions & 10 deletions ios/reactnative_uitpas.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,7 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -573,11 +569,7 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reactnative_uitpas",
"version": "2.0.2",
"version": "2.0.3-2",
"private": true,
"scripts": {
"android": "react-native run-android --variant=debug --appIdSuffix=debug",
Expand Down Expand Up @@ -61,7 +61,7 @@
"react-native-screens": "^3.29.0",
"react-native-svg": "^13.6.0",
"react-native-url-polyfill": "^1.3.0",
"react-native-vision-camera": "^3.9.0",
"react-native-vision-camera": "^4.5.0",
"styled-components": "^5.3.11"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7934,10 +7934,10 @@ react-native-url-polyfill@^1.3.0:
dependencies:
whatwg-url-without-unicode "8.0.0-3"

react-native-vision-camera@^3.9.0:
version "3.9.0"
resolved "https://registry.yarnpkg.com/react-native-vision-camera/-/react-native-vision-camera-3.9.0.tgz#6a96a6cbad53c2db84d671c388b250327681a553"
integrity sha512-q0HejFTS56s5DXWHZhlWLLZMKn/8OXALrqET+FySPIKskwYEdJ5rOV2aDlD6hlo67qCNFGUIMZWGFFc9L2os1g==
react-native-vision-camera@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/react-native-vision-camera/-/react-native-vision-camera-4.5.0.tgz#47b475d12b3002baf18a2fbe9f4fd75c97f2cb00"
integrity sha512-WvfAad9uMgNmS7sndo+j4XInhwhgt6fpwGqVkt6oU4a2QS9r3DWK5lVm+5nGhMkSUZp5aoKPP0tQGALStNfZeQ==

[email protected]:
version "0.73.6"
Expand Down

0 comments on commit 3a3616c

Please sign in to comment.