Skip to content

Commit 3f39a9c

Browse files
authored
Bump yarn.lock and fix android.manifest (software-mansion#606)
yarn.lock is out of sync of package.json. Compilation with AS leads to error after bumping gradle and gradle wrapper: `The minSdk version should not be declared in the android manifest file. You can move the version from the manifest to the defaultConfig in the build.gradle file.`
1 parent 2f45289 commit 3f39a9c

File tree

2 files changed

+23
-38
lines changed

2 files changed

+23
-38
lines changed

Example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
88

9-
<uses-sdk
10-
android:minSdkVersion="16"
11-
android:targetSdkVersion="22" />
9+
<uses-sdk android:targetSdkVersion="22" />
1210

1311
<application
1412
android:name=".MainApplication"

Example/yarn.lock

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,6 @@
411411
dependencies:
412412
"@babel/helper-plugin-utils" "^7.0.0"
413413

414-
"@babel/plugin-syntax-flow@^7.2.0":
415-
version "7.2.0"
416-
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
417-
integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==
418-
dependencies:
419-
"@babel/helper-plugin-utils" "^7.0.0"
420-
421414
"@babel/plugin-syntax-json-strings@^7.2.0":
422415
version "7.2.0"
423416
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
@@ -5666,6 +5659,13 @@ [email protected]:
56665659
dependencies:
56675660
"@babel/core" "^7.0.0"
56685661

5662+
5663+
version "0.45.2"
5664+
resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.45.2.tgz#e7208606b062c5c9ea0544b196453695e1b04428"
5665+
integrity sha512-DPosCjQdC+GnGKlb7RTS8XIGRgWctN7Tja4EYsU/jfIUs1qBy1x8B5an7Rtpy2eBilwjBk0/qeDQ3tboDT2ebg==
5666+
dependencies:
5667+
"@babel/helper-module-imports" "^7.0.0"
5668+
56695669
56705670
version "0.51.0"
56715671
resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.51.0.tgz#af27dd81666b91f05d2b371b0d6d283c585e38b6"
@@ -5680,13 +5680,6 @@ [email protected]:
56805680
dependencies:
56815681
"@babel/helper-module-imports" "^7.0.0"
56825682

5683-
5684-
version "0.54.0"
5685-
resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.54.0.tgz#3c76e15b149db114f636a443f76771b52b7904a1"
5686-
integrity sha512-+VY6BfM8qNgnJ3EwvXFN68WPRvGSNBW0+CL1ZdgjUFTIdlhvf8YkrDCtZTw+DtVuy9C0RtqUJXALVXCFUigwwQ==
5687-
dependencies:
5688-
"@babel/helper-module-imports" "^7.0.0"
5689-
56905683
56915684
version "0.51.1"
56925685
resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.51.1.tgz#d0b296eab8e009214413bba87e4eac3d9b44cd04"
@@ -5730,19 +5723,16 @@ [email protected]:
57305723
dependencies:
57315724
uglify-es "^3.1.9"
57325725

5733-
metro-react-native-babel-preset@0.51.0:
5734-
version "0.51.0"
5735-
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.0.tgz#978d960acf2d214bbbe43e59145878d663bd07de"
5736-
integrity sha512-Y/aPeLl4RzY8IEAneOyDcpdjto/8yjIuX9eUWRngjSqdHYhGQtqiSBpfTpo0BvXpwNRLwCLHyXo58gNpckTJFw==
5726+
metro-react-native-babel-preset@0.45.2:
5727+
version "0.45.2"
5728+
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.45.2.tgz#d9a4a7af65380527010fe7245641f57a9ab031b6"
5729+
integrity sha512-nozYxitD031zi9Bjw2yRYv3xlO/ZecS5CKK/OvxrrNVDSPSBG4G2fFMDXaCSkI/ucWxeHGfgszj2IIAfCPJJ2g==
57375730
dependencies:
57385731
"@babel/plugin-proposal-class-properties" "^7.0.0"
5739-
"@babel/plugin-proposal-export-default-from" "^7.0.0"
57405732
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
57415733
"@babel/plugin-proposal-object-rest-spread" "^7.0.0"
57425734
"@babel/plugin-proposal-optional-catch-binding" "^7.0.0"
57435735
"@babel/plugin-proposal-optional-chaining" "^7.0.0"
5744-
"@babel/plugin-syntax-dynamic-import" "^7.0.0"
5745-
"@babel/plugin-syntax-export-default-from" "^7.0.0"
57465736
"@babel/plugin-transform-arrow-functions" "^7.0.0"
57475737
"@babel/plugin-transform-block-scoping" "^7.0.0"
57485738
"@babel/plugin-transform-classes" "^7.0.0"
@@ -5760,21 +5750,19 @@ [email protected]:
57605750
"@babel/plugin-transform-react-jsx" "^7.0.0"
57615751
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
57625752
"@babel/plugin-transform-regenerator" "^7.0.0"
5763-
"@babel/plugin-transform-runtime" "^7.0.0"
57645753
"@babel/plugin-transform-shorthand-properties" "^7.0.0"
57655754
"@babel/plugin-transform-spread" "^7.0.0"
57665755
"@babel/plugin-transform-sticky-regex" "^7.0.0"
57675756
"@babel/plugin-transform-template-literals" "^7.0.0"
57685757
"@babel/plugin-transform-typescript" "^7.0.0"
57695758
"@babel/plugin-transform-unicode-regex" "^7.0.0"
57705759
"@babel/template" "^7.0.0"
5771-
metro-babel7-plugin-react-transform "0.51.0"
5772-
react-transform-hmr "^1.0.4"
5760+
metro-babel7-plugin-react-transform "0.45.2"
57735761

5774-
5775-
version "0.51.1"
5776-
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.1.tgz#44aeeedfea37f7c2ab8f6f273fa71b90fe65f089"
5777-
integrity sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw==
5762+
5763+
version "0.51.0"
5764+
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.0.tgz#978d960acf2d214bbbe43e59145878d663bd07de"
5765+
integrity sha512-Y/aPeLl4RzY8IEAneOyDcpdjto/8yjIuX9eUWRngjSqdHYhGQtqiSBpfTpo0BvXpwNRLwCLHyXo58gNpckTJFw==
57785766
dependencies:
57795767
"@babel/plugin-proposal-class-properties" "^7.0.0"
57805768
"@babel/plugin-proposal-export-default-from" "^7.0.0"
@@ -5809,13 +5797,13 @@ [email protected]:
58095797
"@babel/plugin-transform-typescript" "^7.0.0"
58105798
"@babel/plugin-transform-unicode-regex" "^7.0.0"
58115799
"@babel/template" "^7.0.0"
5812-
metro-babel7-plugin-react-transform "0.51.1"
5800+
metro-babel7-plugin-react-transform "0.51.0"
58135801
react-transform-hmr "^1.0.4"
58145802

5815-
metro-react-native-babel-preset@^0.54.0:
5816-
version "0.54.0"
5817-
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.54.0.tgz#9425ed40338f41234f1ea57d61026b78b66b06d6"
5818-
integrity sha512-h+wJnTrl2dcY4+8PTElQznbLat1F2l2NgvoKvQW5h9ZONR850usyr1ViDAgHVRnOjzjByxqDIEJpZbbKCFQeww==
5803+
metro-react-native-babel-preset@0.51.1:
5804+
version "0.51.1"
5805+
resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.51.1.tgz#44aeeedfea37f7c2ab8f6f273fa71b90fe65f089"
5806+
integrity sha512-e9tsYDFhU70gar0jQWcZXRPJVCv4k7tEs6Pm74wXO2OO/T1MEumbvniDIGwGG8bG8RUnYdHhjcaiub2Vc5BRWw==
58195807
dependencies:
58205808
"@babel/plugin-proposal-class-properties" "^7.0.0"
58215809
"@babel/plugin-proposal-export-default-from" "^7.0.0"
@@ -5825,7 +5813,6 @@ metro-react-native-babel-preset@^0.54.0:
58255813
"@babel/plugin-proposal-optional-chaining" "^7.0.0"
58265814
"@babel/plugin-syntax-dynamic-import" "^7.0.0"
58275815
"@babel/plugin-syntax-export-default-from" "^7.0.0"
5828-
"@babel/plugin-syntax-flow" "^7.2.0"
58295816
"@babel/plugin-transform-arrow-functions" "^7.0.0"
58305817
"@babel/plugin-transform-block-scoping" "^7.0.0"
58315818
"@babel/plugin-transform-classes" "^7.0.0"
@@ -5851,7 +5838,7 @@ metro-react-native-babel-preset@^0.54.0:
58515838
"@babel/plugin-transform-typescript" "^7.0.0"
58525839
"@babel/plugin-transform-unicode-regex" "^7.0.0"
58535840
"@babel/template" "^7.0.0"
5854-
metro-babel7-plugin-react-transform "0.54.0"
5841+
metro-babel7-plugin-react-transform "0.51.1"
58555842
react-transform-hmr "^1.0.4"
58565843

58575844

0 commit comments

Comments
 (0)