Skip to content

Commit 7ee98ca

Browse files
authored
Merge branch 'main' into fix-migration-utils
2 parents c7eb3e3 + 660737f commit 7ee98ca

File tree

5 files changed

+47
-10
lines changed

5 files changed

+47
-10
lines changed

src/fragments/lib/datastore/react-native/getting-started/30_platformIntegration.mdx

+10-5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ cd AmplifyDataStoreRN
99
npm install aws-amplify @aws-amplify/react-native @react-native-community/netinfo @react-native-async-storage/async-storage react-native-get-random-values
1010
```
1111

12+
`@aws-amplify/react-native` requires a minimum iOS deployment target of `13.0`, open the _Podfile_ located in the _ios_ directory and update the `target` value:
13+
14+
```diff
15+
- platform :ios, min_ios_version_supported
16+
+ platform :ios, 13.0
17+
```
18+
1219
You will also need to install the pod dependencies for iOS:
1320

1421
```sh
@@ -41,8 +48,7 @@ DataStore.configure({
4148

4249
<Callout>
4350

44-
The SQLite storage adapter does not currently support custom primary keys.
45-
Disable custom primary key in `amplify/cli.json` by setting `graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField` to `false`.
51+
The SQLite storage adapter does not currently support custom primary keys. Disable custom primary key in `amplify/cli.json` by setting `graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField` to `false`.
4652

4753
</Callout>
4854
</Block>
@@ -81,9 +87,8 @@ DataStore.configure({
8187

8288
<Callout>
8389

84-
The SQLite storage adapter does not currently support custom primary keys.
85-
Disable custom primary key in `amplify/cli.json` by setting `graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField` to `false`.
90+
The SQLite storage adapter does not currently support custom primary keys. Disable custom primary key in `amplify/cli.json` by setting `graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField` to `false`.
8691

8792
</Callout>
8893
</Block>
89-
</BlockSwitcher>
94+
</BlockSwitcher>

src/fragments/lib/troubleshooting/common/upgrading.mdx

+7-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ npm install aws-amplify @aws-amplify/react-native @react-native-community/netinf
8888

8989
Note that v6 supports react-native v0.70+, so if you prefer manually upgrading dependencies double-check the version of react-native in your package.json file.
9090

91+
`@aws-amplify/react-native` requires a minimum iOS deployment target of `13.0`, if has not already been set to `13.01 or above, open the _Podfile_ located in the _ios_ directory and update the `target` value:
92+
93+
```diff
94+
- platform :ios, min_ios_version_supported
95+
+ platform :ios, 13.0
96+
```
97+
9198
<Callout>
9299

93100
If you are using `signInWithRedirect` (previously `Auth.federatedSignIn`) you will need to install the `@aws-amplify/rtn-web-browser` native module.
@@ -188,7 +195,6 @@ If you have previously configured Amplify by passing the configuration object li
188195

189196
</InlineFilter>
190197

191-
192198
**Running Amplify on the server with NextJS**
193199

194200
To enable the use of the Amplify JavaScript library on the server, you need to set the `ssr` configuration to true in the `Amplify.configure` function.

src/fragments/start/getting-started/reactnative/setup.mdx

+15-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ To get started, initialize a new React Native project.
55
<BlockSwitcher>
66
<Block name="Expo CLI">
77

8-
Create a new app with the following command:
8+
Create a new app with the following command:
99

1010
```sh
1111
npx create-expo-app amplified_todo
@@ -22,11 +22,13 @@ npm install aws-amplify @aws-amplify/react-native @aws-amplify/rtn-web-browser @
2222
Start the app with the following command:
2323

2424
For Android:
25+
2526
```sh
2627
npx expo run:android
2728
```
2829

2930
For iOS:
31+
3032
```sh
3133
npx expo run:ios
3234
```
@@ -36,7 +38,7 @@ Follow the additional prompts to configure your build and allow it some time to
3638
</Block>
3739
<Block name="React Native CLI">
3840

39-
After you [setup development environment](https://reactnative.dev/docs/environment-setup), create a new app with the following command:
41+
After you [setup development environment](https://reactnative.dev/docs/environment-setup), create a new app with the following command:
4042

4143
```bash
4244
npx react-native init amplified_todo
@@ -50,6 +52,13 @@ Install the necessary dependencies by running the following command:
5052
npm install aws-amplify @aws-amplify/react-native @react-native-community/netinfo @react-native-async-storage/async-storage
5153
```
5254

55+
`@aws-amplify/react-native` requires a minimum iOS deployment target of `13.0`, open the _Podfile_ located in the _ios_ directory and update the `target` value:
56+
57+
```diff
58+
- platform :ios, min_ios_version_supported
59+
+ platform :ios, 13.0
60+
```
61+
5362
You will also need to install the pod dependencies for iOS:
5463

5564
```sh
@@ -85,7 +94,7 @@ amplify init
8594
When you initialize Amplify you'll be prompted for some information about the app, with the option to accept recommended values:
8695

8796
```console
88-
? Enter a name for the project (amplified_todo)
97+
? Enter a name for the project (amplified_todo)
8998
The following configuration will be applied:
9099

91100
Project information
@@ -117,6 +126,7 @@ When you initialize a new Amplify project, a few things happen:
117126
## Set up frontend
118127

119128
Next, configure Amplify so it can interact with backend services by adding the following code below the last import:
129+
120130
<BlockSwitcher>
121131
<Block name="Expo CLI">
122132

@@ -127,6 +137,7 @@ import { Amplify } from 'aws-amplify';
127137
import amplifyconfig from './src/amplifyconfiguration.json';
128138
Amplify.configure(amplifyconfig);
129139
```
140+
130141
</Block>
131142
<Block name="React Native CLI">
132143

@@ -137,6 +148,7 @@ import { Amplify } from 'aws-amplify';
137148
import amplifyconfig from './src/amplifyconfiguration.json';
138149
Amplify.configure(amplifyconfig);
139150
```
151+
140152
</Block>
141153
</BlockSwitcher>
142154

src/pages/[platform]/start/getting-started/auth/index.mdx

+8-1
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,16 @@ npm install @aws-amplify/ui-react-native react-native-get-random-values react-na
9494
npm install @aws-amplify/ui-react-native react-native-safe-area-context react-native-get-random-values react-native-url-polyfill
9595
```
9696

97+
`@aws-amplify/react-native` requires a minimum iOS deployment target of `13.0`, open the _Podfile_ located in the _ios_ directory and update the `target` value:
98+
99+
```diff
100+
- platform :ios, min_ios_version_supported
101+
+ platform :ios, 13.0
102+
```
103+
97104
You will also need to install the pod dependencies for iOS:
98105

99-
```sh
106+
```bash
100107
npx pod-install
101108
```
102109

src/pages/[platform]/start/getting-started/setup/index.mdx

+7
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,13 @@ npm install aws-amplify @aws-amplify/react-native @aws-amplify/rtn-web-browser @
585585
npm install aws-amplify @aws-amplify/react-native @react-native-community/netinfo @react-native-async-storage/async-storage
586586
```
587587

588+
`@aws-amplify/react-native` requires a minimum iOS deployment target of `13.0`, open the _Podfile_ located in the _ios_ directory and update the `target` value:
589+
590+
```diff
591+
- platform :ios, min_ios_version_supported
592+
+ platform :ios, 13.0
593+
```
594+
588595
You will also need to install the pod dependencies for iOS:
589596

590597
```sh

0 commit comments

Comments
 (0)