Fix DEFINE_MODULES to DEFINES_MODULE

README.md

@@ -6,10 +6,127 @@ Start from there up to the `[TurboModule] Test the Turbomodule` section. Then, f
 ## Table of contents
 
 * [[Setup] Update to 0.71-RC.3](#update)
+* [[Setup] Update podspec](#update-podspec)
+* [[Swift] Add Swift files](#swift)
+* [[iOS] Update Calculator file](#update-calculator)
+* [[Test] Test the swift TurboModule](#test-swift)
 
 ## Steps
 
-### <a name="update">[[Setup] Update to 0.71-RC.3]()
+### <a name="update" />[[Setup] Update to 0.71-RC.3](https://github.com/cipolleschi/RNNewArchitectureLibraries/commit/a2d9d5c19eb4b936b91f937777f8590952aa6371)
 
 1. `cd NewArchitecture` - It has been created in this [step](https://github.com/react-native-community/RNNewArchitectureLibraries/tree/feat/back-turbomodule-070#tm-test).
 2. `yarn add react-native@0.71.0-rc.3`
+
+### <a name="update-podspec" />[[Setup] Update podspec](https://github.com/cipolleschi/RNNewArchitectureLibraries/commit/8fabf4db37eca45726bab5d993d8e9f97d0cc5be)
+
+1. Open the `calculator/calculator.podspec` file
+2. Update it as it follows:
+```diff
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+-folly_version = '2021.07.22.00'
+-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+Pod::Spec.new do |s|
+  s.name            = "calculator"
+  s.version         = package["version"]
+  s.summary         = package["description"]
+  s.description     = package["description"]
+  s.homepage        = package["homepage"]
+  s.license         = package["license"]
+  s.platforms       = { :ios => "11.0" }
+  s.author          = package["author"]
+  s.source          = { :git => package["repository"], :tag => "#{s.version}" }
+
+  s.source_files    = "ios/**/*.{h,m,mm,swift}"
+
++  s.pod_target_xcconfig    = {
++    "DEFINE_MODULES" => "YES",
++    "BUILD_LIBRARY_FOR_DISTRIBUTION" => "YES",
++    "SWIFT_OBJC_BRIDGING_HEADER" => "../../node_modules/calculator/ios/calculator-Bridging-Header.h"
++  }
+
++  install_modules_dependencies(s)
+-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+-      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+-      s.pod_target_xcconfig    = {
+-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+-      }
+-
+-      s.dependency "React-Codegen"
+-      s.dependency "RCT-Folly", folly_version
+-      s.dependency "RCTRequired"
+-      s.dependency "RCTTypeSafety"
+-      s.dependency "ReactCommon/turbomodule/core"
+-  end
+end
+```
+
+### <a name="swift" />[[Swift] Add Swift files](https://github.com/cipolleschi/RNNewArchitectureLibraries/commit/88e9dd2948cd1fe3a318a21b499c1c71a072ed09)
+
+1. Create a new file: `calculator/ios/calculator-Bridging-Header.h` with the following content
+    ```c++
+    //
+    // Add the Objective-C headers that must imported by Swift files
+    //
+    ```
+    **Note:** This file is used to specify some headers files that the Swift code should be able to import. For this example, it will stay empty. However, it is required to properly build the project.
+2. Create a new file `calculator/ios/Calculator.swift` with the implementation of the logic:
+    ```swift
+    import Foundation
+
+    @objc
+    class Calculator: NSObject {
+
+      @objc
+      static func add(a: Int, b: Int) -> Int {
+        return a+b;
+      }
+    }
+    ```
+
+### <a name="upadet-calculator" />[[iOS] Update Calculator file](https://github.com/cipolleschi/RNNewArchitectureLibraries/commit/ed61fd80b7fcb34baad974c96b9c7e0b1bc89932)
+
+1. Open the `calculator/ios/RNCalculator.mm` file and update the logic to invoke the Swift one
+    ```diff
+    #ifdef RCT_NEW_ARCH_ENABLED
+    #import "RNCalculatorSpec.h"
+    #endif
+
+    + #import "calculator-Swift.h"
+
+    @implementation RNCalculator
+
+    RCT_EXPORT_MODULE(Calculator)
+
+    RCT_REMAP_METHOD(add, addA:(NSInteger)a
+                            andB:(NSInteger)b
+                    withResolver:(RCTPromiseResolveBlock) resolve
+                    withRejecter:(RCTPromiseRejectBlock) reject)
+    {
+    -    NSNumber *result = [[NSNumber alloc] initWithInteger:a+b];
+    +    NSNumber *result = @([Calculator addWithA:a b:b]);
+        resolve(result);
+    }
+    ```
+
+### <a name="test-swift" /> [[Test] Test the swift TurboModule](https://github.com/cipolleschi/RNNewArchitectureLibraries/commit/76923b13da87a09add8b0727032e80fdf7c1b11e)
+
+1. Navigate to the `NewArchitecture` root folder:
+2. `yarn add ../calculator`
+3. `cd ios`
+4. `RCT_NEW_ARCH_ENABLED=1 bundle exec pod install`
+5. `cd ..`
+6. `yarn ios`
+7. Click on Calculate and observe that the app is still working.
+
+If you want to verify that the Swift code is invoked:
+- Add a `print(">>> Calling from Swift")` statement in the `calculator/ios/Calculator.swift`.
+- Open the `ios/NewArchitexture.xcworkspace` in Xcode.
+- Run the app from Xcode.
+- Observe the `>>> Calling from Swift` in the Xcode console.

calculator/calculator.podspec

@@ -2,9 +2,6 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-folly_version = '2021.07.22.00'
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-
 Pod::Spec.new do |s|
   s.name            = "calculator"
   s.version         = package["version"]
@@ -18,20 +15,11 @@ Pod::Spec.new do |s|
 
   s.source_files    = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency "React-Core"
-
-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-        s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-        s.pod_target_xcconfig    = {
-            "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-            "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-        }
+  s.pod_target_xcconfig    = {
+    "DEFINES_MODULE" => "YES",
+    "BUILD_LIBRARY_FOR_DISTRIBUTION" => "YES",
+    "SWIFT_OBJC_BRIDGING_HEADER" => "../../node_modules/calculator/ios/calculator-Bridging-Header.h"
+  }
 
-        s.dependency "React-Codegen"
-        s.dependency "RCT-Folly", folly_version
-        s.dependency "RCTRequired"
-        s.dependency "RCTTypeSafety"
-        s.dependency "ReactCommon/turbomodule/core"
-    end
+  install_modules_dependencies(s)
 end

calculator/ios/Calculator.swift

@@ -0,0 +1,10 @@
+import Foundation
+
+@objc
+class Calculator: NSObject {
+
+  @objc
+  static func add(a: Int, b: Int) -> Int {
+    return a+b;
+  }
+}

calculator/ios/RNCalculator.mm

@@ -4,6 +4,8 @@
 #import "RNCalculatorSpec.h"
 #endif
 
+#import "calculator-Swift.h"
+
 @implementation RNCalculator
 
 RCT_EXPORT_MODULE()
@@ -26,7 +28,7 @@ @implementation RNCalculator
 #endif
 
 - (void)add:(double)a b:(double)b resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
-  NSNumber *result = [[NSNumber alloc] initWithInteger:a+b];
+  NSNumber *result = @([Calculator addWithA:a b:b]);
   resolve(result);
 }
 

calculator/ios/calculator-Bridging-Header.h

@@ -0,0 +1,3 @@
+//
+// Add the Objective-C headers that must imported by Swift files
+//