Merge pull request #1710 from planetary-social/hot-reloading-with-inject

Support hot reloading with Inject

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Download and parse an author’s lists when viewing their profile. [#49](https://github.com/verse-pbc/issues/issues/49)
 - Updated fastlane scripts to fix the TestFlight deployment pipeline. [#97](https://github.com/verse-pbc/issues/issues/97)
 - Removed inactive accounts from Discover tab. [#94](https://github.com/verse-pbc/issues/issues/94)
+- Added the Inject framework for hot reloading. [#1710](https://github.com/planetary-social/nos/pull/1710)
 
 ## [1.0.3] - 2024-12-04Z
 

CONTRIBUTING.md

@@ -53,6 +53,10 @@ For now `main` is the main branch and code improvements are made in topic branch
 
 A maintainer will review your code and merge it when it has the required number of approvals.
 
+## Hot Reloading
+
+We make use of the [Inject](https://github.com/krzysztofzablocki/Inject) framework for hot reloading debug builds. To set up hot reloading, follow the [documentation](https://github.com/krzysztofzablocki/Inject?tab=readme-ov-file#individual-developer-setup-once-per-machine).
+
 ## Dependency Management
 
 We prefer to install dependencies using the Swift Package Manager. 

Nos.xcodeproj/project.pbxproj

@@ -447,6 +447,7 @@
 		C987F85429BA951E00B44E7A /* ClarityCity-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = C987F83129BA951E00B44E7A /* ClarityCity-Thin.otf */; };
 		C987F85529BA951E00B44E7A /* ClarityCity-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = C987F83129BA951E00B44E7A /* ClarityCity-Thin.otf */; };
 		C987F85B29BA9ED800B44E7A /* Font+Clarity.swift in Sources */ = {isa = PBXBuildFile; fileRef = C987F85729BA981800B44E7A /* Font+Clarity.swift */; };
+		C9887D812D1EF3C400CF9101 /* Inject in Frameworks */ = {isa = PBXBuildFile; productRef = C98905A12CD3B8CF00C17EE0 /* Inject */; };
 		C98A32272A05795E00E3FA13 /* Task+Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98A32262A05795E00E3FA13 /* Task+Timeout.swift */; };
 		C98A32282A05795E00E3FA13 /* Task+Timeout.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98A32262A05795E00E3FA13 /* Task+Timeout.swift */; };
 		C98B8B4029FBF83B009789C8 /* NotificationCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98B8B3F29FBF83B009789C8 /* NotificationCard.swift */; };
@@ -1077,6 +1078,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C9887D812D1EF3C400CF9101 /* Inject in Frameworks */,
 				C9DEC068298965270078B43A /* Starscream in Frameworks */,
 				C9FD35132BCED5A6008F8D95 /* NostrSDK in Frameworks */,
 				C9B71DC02A8E9BAD0031ED9F /* SentrySwiftUI in Frameworks */,
@@ -2137,6 +2139,7 @@
 				C9FD35122BCED5A6008F8D95 /* NostrSDK */,
 				03C49ABF2C938A9C00502321 /* SwiftSoup */,
 				039389222CA4985C00698978 /* SDWebImageWebPCoder */,
+				C98905A12CD3B8CF00C17EE0 /* Inject */,
 			);
 			productName = Nos;
 			productReference = C9DEBFCE298941000078B43A /* Nos.app */;
@@ -2233,6 +2236,7 @@
 				C9FD35112BCED5A6008F8D95 /* XCRemoteSwiftPackageReference "nostr-sdk-ios" */,
 				03C49ABE2C938A9C00502321 /* XCRemoteSwiftPackageReference "SwiftSoup" */,
 				039389212CA4985C00698978 /* XCRemoteSwiftPackageReference "SDWebImageWebPCoder" */,
+				C98905A02CD3B8CF00C17EE0 /* XCRemoteSwiftPackageReference "Inject" */,
 			);
 			productRefGroup = C9DEBFCF298941000078B43A /* Products */;
 			projectDirPath = "";
@@ -2967,6 +2971,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "";
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 			};
@@ -3138,6 +3143,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -3188,6 +3194,11 @@
 				LOCALIZED_STRING_SWIFTUI_SUPPORT = NO;
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MARKETING_VERSION = 1.1.1;
+				OTHER_LDFLAGS = "";
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-Xlinker",
+					"-interposable",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.verse.Nos-dev";
 				PRODUCT_MODULE_NAME = Nos;
 				PRODUCT_NAME = "$(TARGET_NAME) Dev";
@@ -3356,6 +3367,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -3414,6 +3426,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "";
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 			};
@@ -3713,6 +3726,14 @@
 				minimumVersion = 1.0.0;
 			};
 		};
+		C98905A02CD3B8CF00C17EE0 /* XCRemoteSwiftPackageReference "Inject" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/krzysztofzablocki/Inject.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.5.2;
+			};
+		};
 		C99DBF7C2A9E81CF00F7068F /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SDWebImage/SDWebImageSwiftUI";
@@ -3864,6 +3885,11 @@
 			package = C96CB98A2A6040C500498C4E /* XCRemoteSwiftPackageReference "swift-collections" */;
 			productName = DequeModule;
 		};
+		C98905A12CD3B8CF00C17EE0 /* Inject */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = C98905A02CD3B8CF00C17EE0 /* XCRemoteSwiftPackageReference "Inject" */;
+			productName = Inject;
+		};
 		C99DBF7D2A9E81CF00F7068F /* SDWebImageSwiftUI */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = C99DBF7C2A9E81CF00F7068F /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */;

Nos.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "f8bae06dbeb84f5992ca8659ee3a2a75550fe8b31994d37a658183a21f1c8131",
+  "originHash" : "62d037ae150ed2e6e150f06b42119c5158134318243e742971b3ccfa3a3a5323",
   "pins" : [
     {
       "identity" : "bech32",
@@ -37,6 +37,15 @@
         "version" : "1.8.2"
       }
     },
+    {
+      "identity" : "inject",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/krzysztofzablocki/Inject.git",
+      "state" : {
+        "revision" : "728c56639ecb3df441d51d5bc6747329afabcfc9",
+        "version" : "1.5.2"
+      }
+    },
     {
       "identity" : "libwebp-xcode",
       "kind" : "remoteSourceControl",

Nos/NosApp.swift

@@ -2,6 +2,7 @@ import SwiftUI
 import Logger
 import Dependencies
 import TipKit
+import Inject
 
 @main
 struct NosApp: App {
@@ -15,6 +16,7 @@ struct NosApp: App {
     private let appController = AppController()
     @Environment(\.scenePhase) private var scenePhase
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+    @ObserveInjection var inject
 
     init() {
         _ = crashReporting // force crash reporting init as early as possible
@@ -24,6 +26,11 @@ struct NosApp: App {
         UIView.appearance(whenContainedInInstancesOf: [UIAlertController.self]).tintColor = .systemBlue
         persistenceController.scheduleBackgroundCleanupTask()
         try? Tips.configure()
+
+        #if DEBUG
+        Bundle(path: "/Applications/InjectionIII.app/Contents/Resources/iOSInjection.bundle")?.load()
+        InjectConfiguration.animation = .interactiveSpring()
+        #endif
     }
 
     var body: some Scene {

Nos/Views/Home/HomeFeedView.swift

@@ -3,12 +3,14 @@ import CoreData
 import Combine
 import Dependencies
 import TipKit
+import Inject
 
 struct HomeFeedView: View {
 
     @Environment(\.managedObjectContext) private var viewContext
     @EnvironmentObject private var router: Router
     @ObservationIgnored @Dependency(\.analytics) private var analytics
+    @ObserveInjection var inject
 
     @State private var refreshController = RefreshController(lastRefreshDate: Date.now + Self.staticLoadTime)
     @State private var isVisible = false
@@ -201,6 +203,7 @@ struct HomeFeedView: View {
         .navigationDestination(for: RelaysDestination.self) { destination in
             RelayView(author: destination.author)
         }
+        .enableInjection()
     }
 }
 

Nos/Views/Home/HomeTab.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import Inject
 
 /// A styled tip view that contains the text provided.
 ///
@@ -58,7 +59,7 @@ struct HomeTab: View {
     @ObservedObject var user: Author
 
     @EnvironmentObject private var router: Router
-
+    @ObserveInjection var inject
     @State private var feedTip = FeedSelectorTip()
     @State private var showFeedTip = false
     @State private var timer: Timer?
@@ -110,6 +111,7 @@ struct HomeTab: View {
                 showTip()
             }
         }
+        .enableInjection()
     }
 
     private func showTip() {

Nos/Views/SideMenu/SideMenuContent.swift

@@ -1,12 +1,14 @@
 import SwiftUI
 import MessageUI
 import Dependencies
+import Inject
 
 struct SideMenuContent: View {
 
     @EnvironmentObject private var router: Router
     @Environment(CurrentUser.self) private var currentUser
     @Dependency(\.analytics) private var analytics
+    @ObserveInjection var inject
 
     @State private var isShowingReportABugMailView = false
     @State private var shareNosPressed = false
@@ -118,6 +120,7 @@ struct SideMenuContent: View {
                 ProfileEditView(author: destination.profile)
             }
         }
+        .enableInjection()
     }
 }