Merge pull request #84 from xmtp/daniel-lower-platform-v

feat: reduce the iOS platform version from 16 to 14
xmtp · Aug 10, 2023 · dd691b4 · dd691b4
2 parents f80751f + 62e9165
commit dd691b4
Show file tree

Hide file tree

Showing 10 changed files with 4,196 additions and 8,684 deletions.
diff --git a/example/App.tsx b/example/App.tsx
@@ -1,4 +1,3 @@
-import { ThirdwebProvider } from "@thirdweb-dev/react-native";
 import React from "react";
 
 import LaunchScreen from "./src/LaunchScreen";
@@ -15,66 +14,64 @@ import { Button } from "react-native";
 const queryClient = new QueryClient();
 export default function App() {
   return (
-    <ThirdwebProvider activeChain="mainnet">
-      <QueryClientProvider client={queryClient}>
-        <XmtpContextProvider>
-          <NavigationContainer>
-            <Navigator.Navigator>
-              <Navigator.Screen
-                name="launch"
-                component={LaunchScreen}
-                options={{
-                  title: "XMTP RN Example",
-                  headerStyle: {
-                    backgroundColor: "rgb(49 0 110)",
-                  },
-                  headerTintColor: "#fff",
-                  headerTitleStyle: {
-                    fontWeight: "bold",
-                  },
-                }}
-              />
-              <Navigator.Screen
-                name="test"
-                component={TestScreen}
-                options={{ title: "Unit Tests" }}
-              />
-              <Navigator.Screen
-                name="home"
-                component={HomeScreen}
-                options={({ navigation }) => ({
-                  title: "My Conversations",
-                  headerStyle: {
-                    backgroundColor: "rgb(49 0 110)",
-                  },
-                  headerTintColor: "#fff",
-                  headerTitleStyle: {
-                    fontWeight: "bold",
-                  },
-                  headerRight: () => (
-                    <Button
-                      onPress={() => navigation.navigate("conversationCreate")}
-                      title="New"
-                      color="#fff"
-                    />
-                  ),
-                })}
-              />
-              <Navigator.Screen
-                name="conversation"
-                component={ConversationScreen}
-                options={{ title: "Conversation" }}
-                initialParams={{ topic: "" }}
-              />
-              <Navigator.Screen
-                name="conversationCreate"
-                component={ConversationCreateScreen}
-                options={{ title: "New Conversation" }}
-              />
-            </Navigator.Navigator>
-          </NavigationContainer>
-        </XmtpContextProvider>
-      </QueryClientProvider>
-    </ThirdwebProvider>
+    <QueryClientProvider client={queryClient}>
+      <XmtpContextProvider>
+        <NavigationContainer>
+          <Navigator.Navigator>
+            <Navigator.Screen
+              name="launch"
+              component={LaunchScreen}
+              options={{
+                title: "XMTP RN Example",
+                headerStyle: {
+                  backgroundColor: "rgb(49 0 110)",
+                },
+                headerTintColor: "#fff",
+                headerTitleStyle: {
+                  fontWeight: "bold",
+                },
+              }}
+            />
+            <Navigator.Screen
+              name="test"
+              component={TestScreen}
+              options={{ title: "Unit Tests" }}
+            />
+            <Navigator.Screen
+              name="home"
+              component={HomeScreen}
+              options={({ navigation }) => ({
+                title: "My Conversations",
+                headerStyle: {
+                  backgroundColor: "rgb(49 0 110)",
+                },
+                headerTintColor: "#fff",
+                headerTitleStyle: {
+                  fontWeight: "bold",
+                },
+                headerRight: () => (
+                  <Button
+                    onPress={() => navigation.navigate("conversationCreate")}
+                    title="New"
+                    color="#fff"
+                  />
+                ),
+              })}
+            />
+            <Navigator.Screen
+              name="conversation"
+              component={ConversationScreen}
+              options={{ title: "Conversation" }}
+              initialParams={{ topic: "" }}
+            />
+            <Navigator.Screen
+              name="conversationCreate"
+              component={ConversationCreateScreen}
+              options={{ title: "New Conversation" }}
+            />
+          </Navigator.Navigator>
+        </NavigationContainer>
+      </XmtpContextProvider>
+    </QueryClientProvider>
   );
 }
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="expo.modules.xmtpreactnativesdk.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="expo.modules.xmtpreactnativesdk.example" xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.RECORD_AUDIO"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

diff --git a/example/index.js b/example/index.js
@@ -1,5 +1,3 @@
-import "@thirdweb-dev/react-native-compat";
-
 import { registerRootComponent } from "expo";
 
 import App from "./App";

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,12 +1,6 @@
 PODS:
   - BigInt (5.0.0)
   - boost (1.76.0)
-  - CoinbaseWalletSDK/Client (1.0.4)
-  - CoinbaseWalletSDK/CrossPlatform (1.0.4):
-    - CoinbaseWalletSDK/Client
-  - CoinbaseWalletSDKExpo (1.0.6):
-    - CoinbaseWalletSDK/CrossPlatform (= 1.0.4)
-    - ExpoModulesCore
   - Connect-Swift (0.6.0):
     - SwiftProtobuf (~> 1.22.0)
   - DoubleConversion (1.1.6)
@@ -26,8 +20,6 @@ PODS:
     - React-Core
     - React-RCTAppDelegate
     - ReactCommon/turbomodule/core
-  - EXSecureStore (12.1.1):
-    - ExpoModulesCore
   - EXSplashScreen (0.18.2):
     - ExpoModulesCore
     - React-Core
@@ -428,7 +420,6 @@ PODS:
 
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
-  - "CoinbaseWalletSDKExpo (from `../node_modules/@coinbase/wallet-mobile-sdk/ios`)"
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - EXApplication (from `../node_modules/expo-application/ios`)
   - EXConstants (from `../node_modules/expo-constants/ios`)
@@ -437,7 +428,6 @@ DEPENDENCIES:
   - Expo (from `../node_modules/expo`)
   - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
-  - EXSecureStore (from `../node_modules/expo-secure-store/ios`)
   - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@@ -486,7 +476,6 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - BigInt
-    - CoinbaseWalletSDK
     - Connect-Swift
     - fmt
     - GenericJSON
@@ -505,8 +494,6 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   boost:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
-  CoinbaseWalletSDKExpo:
-    :path: "../node_modules/@coinbase/wallet-mobile-sdk/ios"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   EXApplication:
@@ -523,8 +510,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-keep-awake/ios"
   ExpoModulesCore:
     :path: "../node_modules/expo-modules-core"
-  EXSecureStore:
-    :path: "../node_modules/expo-secure-store/ios"
   EXSplashScreen:
     :path: "../node_modules/expo-splash-screen/ios"
   FBLazyVector:
@@ -611,8 +596,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   BigInt: 74b4d88367b0e819d9f77393549226d36faeb0d8
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
-  CoinbaseWalletSDK: ea1f37512bbc69ebe07416e3b29bf840f5cc3152
-  CoinbaseWalletSDKExpo: bb952ead802dc20e7214e5a2bdf35f8584f02441
   Connect-Swift: ba76bc64b2153cacce4f7985a21d4d81473dac90
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
@@ -622,7 +605,6 @@ SPEC CHECKSUMS:
   Expo: b7d2843b0a0027d0ce76121a63085764355a16ed
   ExpoKeepAwake: 69f5f627670d62318410392d03e0b5db0f85759a
   ExpoModulesCore: 653958063a301098b541ae4dfed1ac0b98db607b
-  EXSecureStore: e8923258361cc406d0401af380f12bd05b2b720f
   EXSplashScreen: 0e0a9ba0cf7553094e93213099bd7b42e6e237e9
   FBLazyVector: f637f31eacba90d4fdeff3fa41608b8f361c173b
   FBReactNativeSpec: 0d9a4f4de7ab614c49e98c00aedfd3bfbda33d59
@@ -674,7 +656,7 @@ SPEC CHECKSUMS:
   SwiftProtobuf: 7773c4e96a99d7b8ab7cda0fc30a883732ff93b1
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
   XMTP: 06cf1a8d1a14bf4d31442a39c947c623ebe7616c
-  XMTPReactNative: cdd4e4a38bee7f6945485d1a1b9ac4c95d953386
+  XMTPReactNative: b0586df2cac7af316390c8b8686859b548fa43b0
   XMTPRust: 78f65f77b1454392980da244961777aee955652f
   Yoga: 065f0b74dba4832d6e328238de46eb72c5de9556
 

diff --git a/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj b/example/ios/xmtpreactnativesdkexample.xcodeproj/project.pbxproj
@@ -423,7 +423,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = expo.modules.xmtpreactnativesdk.example;
-				PRODUCT_NAME = xmtpreactnativesdkexample;
+				PRODUCT_NAME = "xmtpreactnativesdkexample";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -451,7 +451,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = expo.modules.xmtpreactnativesdk.example;
-				PRODUCT_NAME = xmtpreactnativesdkexample;
+				PRODUCT_NAME = "xmtpreactnativesdkexample";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";