chore: remove dependencies (#1432)

* chore: remove dependencies * lock node versions
ephemeraHQ · Dec 22, 2024 · 63a3882 · 63a3882
1 parent be2aff5
commit 63a3882
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 1,617 deletions.
diff --git a/.github/workflows/build-app-release.yml b/.github/workflows/build-app-release.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Install dependencies
         run: yarn install
@@ -68,7 +68,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Install dependencies
         run: yarn install
@@ -111,7 +111,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Increment version number
         run: |

diff --git a/.github/workflows/build-internal.yml b/.github/workflows/build-internal.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Install dependencies
         run: yarn install
@@ -83,7 +83,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Install dependencies
         run: yarn install
@@ -146,7 +146,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Increment version numbers
         run: node scripts/build/incrementBuildNumbers.js

diff --git a/.github/workflows/check-android-build.yml b/.github/workflows/check-android-build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4.0.2
         with:
-          node-version: 20.x
+          node-version: 20.18.0
           cache: "yarn"
 
       - name: 🏗 Setup EAS

diff --git a/.github/workflows/check-ios-build.yml b/.github/workflows/check-ios-build.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4.0.2
         with:
-          node-version: 20.x
+          node-version: 20.18.0
           cache: "yarn"
 
       - name: 🏗 Setup EAS

diff --git a/.github/workflows/create-new-release.yml b/.github/workflows/create-new-release.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "20"
+          node-version: 20.18.0
 
       - name: Setup Git
         run: |

diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml
@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 20.18.0
           cache: "yarn"
       - run: yarn
       - run: yarn typecheck
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 20.18.0
           cache: "yarn"
       - run: yarn
       - run: yarn lint
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 20.18.0
           cache: "yarn"
       - run: yarn
       - run: yarn test
@@ -53,7 +53,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 20.18.0
           cache: "yarn"
       - run: |
           BASELINE_BRANCH=${GITHUB_BASE_REF:="main"}

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v20.18.0
diff --git a/babel.config.js b/babel.config.js
@@ -18,7 +18,6 @@ module.exports = {
         alias: {
           "fast-text-encoding": "text-encoding",
           // crypto: "react-native-quick-crypto",
-          "react-native-sqlite-storage": "@op-engineering/op-sqlite",
           crypto: "crypto-browserify",
           // This entrypoint mapping is done in @xmtp/user-preferences-bindings-wasm's "exports" in package.json
           // but we don't want to enable unstable_enablePackageExports for now in metro.config.js
@@ -27,7 +26,7 @@ module.exports = {
           "react-native-webview": "react-native-webview/src/index.ts",
 
           // Folder aliases
-          '@': './',
+          "@": "./",
           "@components": "./components",
           "@config": "./config",
           "@containers": "./containers",

diff --git a/ios/Converse.xcodeproj/project.pbxproj b/ios/Converse.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -20,7 +20,6 @@
 		4C2440D72A9C8D56004F31A3 /* Conversations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2440D62A9C8D56004F31A3 /* Conversations.swift */; };
 		4C2440D92A9C8D5C004F31A3 /* Messages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2440D82A9C8D5C004F31A3 /* Messages.swift */; };
 		4C2440DB2A9C8E30004F31A3 /* MMKV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2440DA2A9C8E30004F31A3 /* MMKV.swift */; };
-		4C2440DD2A9C9006004F31A3 /* SQLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2440DC2A9C9006004F31A3 /* SQLite.swift */; };
 		4C31F4EE29AF887B0032D062 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 4C31F4ED29AF887B0032D062 /* Alamofire */; };
 		4C56DB612BA444BC00E84A23 /* ConverseNotificationExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 4C65044A295C7C1F00C5A40F /* ConverseNotificationExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		4C65044D295C7C1F00C5A40F /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C65044C295C7C1F00C5A40F /* NotificationService.swift */; };
@@ -76,7 +75,6 @@
 		4C2440D62A9C8D56004F31A3 /* Conversations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Conversations.swift; sourceTree = "<group>"; };
 		4C2440D82A9C8D5C004F31A3 /* Messages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Messages.swift; sourceTree = "<group>"; };
 		4C2440DA2A9C8E30004F31A3 /* MMKV.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MMKV.swift; sourceTree = "<group>"; };
-		4C2440DC2A9C9006004F31A3 /* SQLite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLite.swift; sourceTree = "<group>"; };
 		4C3F6104295C9038007A969B /* ConverseNotificationExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ConverseNotificationExtension.entitlements; sourceTree = "<group>"; };
 		4C65044A295C7C1F00C5A40F /* ConverseNotificationExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ConverseNotificationExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C65044C295C7C1F00C5A40F /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
@@ -177,7 +175,6 @@
 				4C8BA28A298502DC007F0B76 /* SharedDefaults.swift */,
 				4C72BC352C6280D000926A17 /* Profile.swift */,
 				4C2440DA2A9C8E30004F31A3 /* MMKV.swift */,
-				4C2440DC2A9C9006004F31A3 /* SQLite.swift */,
 				4C65044E295C7C1F00C5A40F /* Info.plist */,
 				4C2440CF2A9C8BE8004F31A3 /* Keychain.swift */,
 				4CBD671B2A9D08050010C648 /* Utils.swift */,
@@ -518,15 +515,13 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher/SQLCipher.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/Sentry/Sentry.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/SwiftProtobuf/SwiftProtobuf.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.swift.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SQLCipher.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Sentry.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SwiftProtobuf.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SQLite.swift.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -626,7 +621,6 @@
 				4C2440D42A9C8CFE004F31A3 /* Client.swift in Sources */,
 				4C2440D22A9C8C5A004F31A3 /* Datatypes.swift in Sources */,
 				4CBD67182A9CF7C30010C648 /* Sentry.swift in Sources */,
-				4C2440DD2A9C9006004F31A3 /* SQLite.swift in Sources */,
 				4C2440D92A9C8D5C004F31A3 /* Messages.swift in Sources */,
 				4CBD671C2A9D08050010C648 /* Utils.swift in Sources */,
 				4C8BA28B298502DC007F0B76 /* SharedDefaults.swift in Sources */,

diff --git a/ios/ConverseNotificationExtension/SQLite.swift b/ios/ConverseNotificationExtension/SQLite.swift
diff --git a/ios/ConverseNotificationExtension/Xmtp/Client.swift b/ios/ConverseNotificationExtension/Xmtp/Client.swift
@@ -9,6 +9,8 @@ import Foundation
 import XMTP
 import Alamofire
 
+extension String: Error {}
+
 func getDbEncryptionKey() throws -> Data {
   if let key = getKeychainValue(forKey: "LIBXMTP_DB_ENCRYPTION_KEY") {
         if let keyData = Data(base64Encoded: key) {

diff --git a/ios/Podfile b/ios/Podfile
@@ -43,16 +43,6 @@ target 'Converse' do
     :privacy_file_aggregation_enabled => podfile_properties['apple.privacyManifestAggregationEnabled'] == 'false',
   )
 
-  pre_install do |installer|
-    installer.pod_targets.each do |pod|
-      if pod.name.eql?('op-sqlite')
-        def pod.build_type
-          Pod::BuildType.static_library
-        end
-      end
-    end
-  end
-
   post_install do |installer|
     # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
     react_native_post_install(
@@ -102,7 +92,6 @@ end
 target 'ConverseNotificationExtension' do
   use_frameworks! :linkage => :static
   pod 'MMKVAppExtension', $mmkvVersion, :linkage => :dynamic
-  pod 'SQLite.swift'
   pod 'XMTP', $xmtpVersion, :modular_headers => true
   # Version must match version from RNSentry Podspec (matching @sentry/react-native package from package.json)
   # https://github.com/getsentry/sentry-react-native/blob/5.24.1/RNSentry.podspec#L36