chore: Addressing code review comments

Author: retyui

.github/actions/build-app/action.yml

@@ -27,26 +27,14 @@ inputs:
     description: 'Platform (example: android or ios))'
     required: true
 
-  node-version:
-    description: 'The Node.js version to set up'
-    required: false
-
-  java-version:
-    description: 'The Java version to set up'
-    required: false
-
 
 runs:
   using: 'composite'
   steps:
     - uses: ./.github/actions/lock-nodejs-ver
-      with:
-        node-version: ${{ inputs.node-version }}
 
     - uses: ./.github/actions/lock-java-ver
       if: ${{ inputs.platform == 'android' }}
-      with:
-        java-version: ${{ inputs.java-version }}
 
     - uses: ./.github/actions/lock-ruby-ver
       if: ${{ inputs.platform == 'ios' }}
@@ -90,25 +78,13 @@ runs:
         if [[ '${{ inputs.platform }}' == 'ios' ]]; then
           brew install xcbeautify
 
-
-          # Disable Flipper
-          # RN 0.69.x and 0.70.x
-          sed -i.bak "s|FlipperConfiguration.enabled|ENV['NO_FLIPPER'] == \"1\" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled|g" ios/Podfile
-          # RN <= 0.68.x
-          sed -i.bak 's|use_flipper!()|if ENV["NO_FLIPPER"] != "1"\n    use_flipper!()\n  end|g' ios/Podfile
-
-          # Fix Xcode 14 (react-native@0.67.x)
-          sed -i.bak 's|node->getLayout().hadOverflow() \|\||node->getLayout().hadOverflow()\|\||g' node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp
-          sed -i.bak 's|node->getLayout().hadOverflow() \||node->getLayout().hadOverflow()\|\||g' node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp
-
-
           # Update pods after adding new module
           npx pod-install
-
+      
           # Build iOS App
           xcodebuild -scheme ${{ env.APP_NAME }} -workspace ios/${{ env.APP_NAME }}.xcworkspace -configuration Release -sdk iphonesimulator -destination 'generic/platform=iOS Simulator'  | xcbeautify --quiet
-
-          # set output variable
+        
+          # set output variable          
           echo "app_path=$(find ~/Library/Developer/Xcode/DerivedData -type d -name "${{ env.APP_NAME }}.app")" >> $GITHUB_OUTPUT
         else
           # Enable new arch for Android
@@ -118,7 +94,7 @@ runs:
 
           # Build Android
           ./android/gradlew assembleRelease --no-daemon -p android -PreactNativeArchitectures=${{ inputs.arch }}
-
+        
           # set output variable
           echo "app_path=$(find $(pwd)/android -type f -name '*.apk')" >> $GITHUB_OUTPUT
         fi

.github/workflows/main.yml

@@ -56,8 +56,7 @@ jobs:
       max-parallel: 4
       matrix:
         new_arch_enabled: [ 1, 0 ]
-        rn_ver: [latest] # also, can be any npm tag: 0.71-stable, next, nightly or version: 0.68, 0.70 ...
-
+        rn_ver: [latest ] # also, can be any npm tag: 0.71-stable, next, nightly
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -71,8 +70,6 @@ jobs:
           module-to-install: file:${{ github.workspace }}
           store-artifacts: true
           platform: android
-          node-version: ${{ contains(matrix.rn_ver, '0.5') && '14' || contains(matrix.rn_ver, '0.6') && '16' || '18' }}
-          java-version: ${{ contains(matrix.rn_ver, '0.5') && '8' || contains(matrix.rn_ver, '0.6') && '11' || '17' }}
 
   build-ios:
     name: Build iOS
@@ -82,10 +79,7 @@ jobs:
       max-parallel: 3
       matrix:
         new_arch_enabled: [ 1, 0 ]
-        rn_ver: [latest] # also, can be any npm tag: 0.71-stable, next, nightly or version: 0.68, 0.70 ...
-
-
-
+        rn_ver: [latest ] # also, can be any npm tag: 0.71-stable, next, nightly
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -98,5 +92,3 @@ jobs:
           module-to-install: file:${{ github.workspace }}
           store-artifacts: true
           platform: ios
-          node-version: ${{ contains(matrix.rn_ver, '0.5') && '14' || contains(matrix.rn_ver, '0.6') && '16' || '18' }}
-          java-version: ${{ contains(matrix.rn_ver, '0.5') && '8' || contains(matrix.rn_ver, '0.6') && '11' || '17' }}

android/build.gradle

@@ -74,7 +74,7 @@ android {
   sourceSets {
     main {
       if (isNewArchitectureEnabled()) {
-        java.srcDirs += ["src/newarch"]
+        java.srcDirs += ["src/newarch", "${project.buildDir}/generated/source/codegen/java"]
       } else {
         java.srcDirs += ["src/oldarch"]
       }
@@ -93,11 +93,3 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
 }
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "RNCImageEditor"
-    codegenJavaPackageName = "com.reactnativecommunity.imageeditor"
-  }
-}

android/gradle.properties

@@ -1,3 +1,3 @@
-RNImageEditor_compileSdkVersion=31
-RNImageEditor_targetSdkVersion=31
+RNImageEditor_compileSdkVersion=34
+RNImageEditor_targetSdkVersion=34
 RNImageEditor_minSdkVersion=21

android/src/main/java/com/reactnativecommunity/imageeditor/ImageEditorPackage.java

@@ -9,11 +9,13 @@
 
 import androidx.annotation.Nullable;
 
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.TurboReactPackage;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -32,21 +34,32 @@ public NativeModule getModule(String name, ReactApplicationContext reactContext)
 
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
-    return () -> {
-      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
-      boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-      moduleInfos.put(
-        ImageEditorModule.NAME,
+    Class<? extends NativeModule>[] moduleList = new Class[] {
+      ImageEditorModule.class
+    };
+    final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
+
+    for (Class<? extends NativeModule> moduleClass : moduleList) {
+      ReactModule reactModule = moduleClass.getAnnotation(ReactModule.class);
+      reactModuleInfoMap.put(
+        reactModule.name(),
         new ReactModuleInfo(
-          ImageEditorModule.NAME,
-          ImageEditorModule.NAME,
-          false, // canOverrideExistingModule
-          false, // needsEagerInit
-          true, // hasConstants
-          false, // isCxxModule
-          isTurboModule // isTurboModule
-        ));
-      return moduleInfos;
+          reactModule.name(),
+          moduleClass.getName(),
+          true,
+          reactModule.needsEagerInit(),
+          reactModule.hasConstants(),
+          reactModule.isCxxModule(),
+          TurboModule.class.isAssignableFrom(moduleClass)
+        )
+      );
+    }
+
+    return new ReactModuleInfoProvider() {
+      @Override
+      public Map<String, ReactModuleInfo> getReactModuleInfos() {
+        return reactModuleInfoMap;
+      }
     };
   }
 }

android/src/newarch/com/reactnativecommunity/imageeditor/ImageEditorModule.java

@@ -1,13 +1,13 @@
 package com.reactnativecommunity.imageeditor;
 
-import android.os.AsyncTask;
-
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = ImageEditorModule.NAME)
 public class ImageEditorModule extends NativeRNCImageEditorSpec {
   private ImageEditorModuleImpl moduleImpl;
 

android/src/oldarch/com/reactnativecommunity/imageeditor/ImageEditorModule.java

@@ -8,7 +8,9 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = ImageEditorModule.NAME)
 public class ImageEditorModule extends ReactContextBaseJavaModule {
   private ImageEditorModuleImpl moduleImpl;