Enable module annotation processor in OSS

facebook · May 30, 2020 · 03d7adf · 03d7adf
1 parent a4757d2
commit 03d7adf
Show file tree

Hide file tree

Showing 29 changed files with 155 additions and 151 deletions.
diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
@@ -27,6 +27,7 @@ ADD .buckconfig /app/.buckconfig
 ADD .buckjavaargs /app/.buckjavaargs
 ADD tools /app/tools
 ADD ReactAndroid /app/ReactAndroid
+ADD android /app/android
 ADD ReactCommon /app/ReactCommon
 ADD React /app/React
 ADD keystores /app/keystores

diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,8 @@ project.xcworkspace
 /ReactAndroid/gradle/
 /ReactAndroid/gradlew
 /ReactAndroid/gradlew.bat
+/android/annotations/build/
+/android/annotations-compiler/build/
 
 # Buck
 .buckd
@@ -51,7 +53,6 @@ buck-out
 .gradle
 local.properties
 *.iml
-/android/
 
 # Node
 node_modules

diff --git a/RNTester/android/app/_BUCK → RNTester/android/app/BUCK b/RNTester/android/app/_BUCK → RNTester/android/app/BUCK
diff --git a/RNTester/android/app/build.gradle b/RNTester/android/app/build.gradle
@@ -168,6 +168,7 @@ dependencies {
 
     // Build React Native from source
     implementation project(':ReactAndroid')
+    annotationProcessor project(":react-native-annotations-compiler")
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
@@ -437,6 +437,9 @@ android {
 }
 
 dependencies {
+    api(project(':react-native-annotations'))
+    annotationProcessor(project(':react-native-annotations-compiler'))
+
     api("com.facebook.infer.annotation:infer-annotation:0.11.2")
     api("com.facebook.yoga:proguard-annotations:1.14.1")
     api("javax.inject:javax.inject:1")

diff --git a/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java b/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.java
@@ -7,19 +7,13 @@
 
 package com.facebook.react;
 
-import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_START;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_END;
-import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_START;
-
 import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.devsupport.LogBoxModule;
-import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.module.annotations.ReactModuleList;
-import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -30,21 +24,22 @@
 import com.facebook.react.modules.debug.SourceCodeModule;
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule;
 import com.facebook.react.modules.systeminfo.AndroidInfoModule;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import com.facebook.react.uimanager.UIImplementationProvider;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewManager;
 import com.facebook.systrace.Systrace;
-import java.util.HashMap;
+
 import java.util.List;
-import java.util.Map;
+
+import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_END;
+import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_START;
+import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_END;
+import static com.facebook.react.bridge.ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_START;
 
 /**
  * This is the basic module to support React Native. The debug modules are now in DebugCorePackage.
  */
 @ReactModuleList(
-    // WARNING: If you modify this list, ensure that the list below in method
-    // getReactModuleInfoByInitialization is also updated
     nativeModules = {
       AndroidInfoModule.class,
       DeviceEventManagerModule.class,
@@ -76,63 +71,9 @@ public CoreModulesPackage(
     mMinTimeLeftInFrameForNonBatchedOperationMs = minTimeLeftInFrameForNonBatchedOperationMs;
   }
 
-  /**
-   * This method is overridden, since OSS does not run the annotation processor to generate {@link
-   * CoreModulesPackage$$ReactModuleInfoProvider} class. Here we check if it exists. If it does not
-   * exist, we generate one manually in {@link
-   * CoreModulesPackage#getReactModuleInfoByInitialization()} and return that instead.
-   */
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
-    try {
-      Class<?> reactModuleInfoProviderClass =
-          Class.forName("com.facebook.react.CoreModulesPackage$$ReactModuleInfoProvider");
-      return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
-    } catch (ClassNotFoundException e) {
-      // In OSS case, the annotation processor does not run. We fall back on creating this byhand
-      Class<? extends NativeModule>[] moduleList =
-          new Class[] {
-            AndroidInfoModule.class,
-            DeviceEventManagerModule.class,
-            DeviceInfoModule.class,
-            DevSettingsModule.class,
-            ExceptionsManagerModule.class,
-            LogBoxModule.class,
-            HeadlessJsTaskSupportModule.class,
-            SourceCodeModule.class,
-            TimingModule.class,
-            UIManagerModule.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(
-                reactModule.name(),
-                moduleClass.getName(),
-                reactModule.canOverrideExistingModule(),
-                reactModule.needsEagerInit(),
-                reactModule.hasConstants(),
-                reactModule.isCxxModule(),
-                TurboModule.class.isAssignableFrom(moduleClass)));
-      }
-
-      return new ReactModuleInfoProvider() {
-        @Override
-        public Map<String, ReactModuleInfo> getReactModuleInfos() {
-          return reactModuleInfoMap;
-        }
-      };
-    } catch (InstantiationException e) {
-      throw new RuntimeException(
-          "No ReactModuleInfoProvider for CoreModulesPackage$$ReactModuleInfoProvider", e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(
-          "No ReactModuleInfoProvider for CoreModulesPackage$$ReactModuleInfoProvider", e);
-    }
+    return new CoreModulesPackage$$ReactModuleInfoProvider();
   }
 
   @Override

diff --git a/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java b/ReactAndroid/src/main/java/com/facebook/react/DebugCorePackage.java
@@ -10,19 +10,11 @@
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.devsupport.JSCHeapCapture;
-import com.facebook.react.devsupport.JSDevSupport;
-import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.module.annotations.ReactModuleList;
-import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * Package defining core framework modules (e.g. UIManager). It should be used for modules that
- * require special integration with other framework parts (e.g. with the list of packages to load
- * view managers from).
+ * Package defining core debug only modules.
  */
 @ReactModuleList(
     nativeModules = {
@@ -44,45 +36,6 @@ public NativeModule getModule(String name, ReactApplicationContext reactContext)
 
   @Override
   public ReactModuleInfoProvider getReactModuleInfoProvider() {
-    try {
-      Class<?> reactModuleInfoProviderClass =
-          Class.forName("com.facebook.react.DebugCorePackage$$ReactModuleInfoProvider");
-      return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
-    } catch (ClassNotFoundException e) {
-      // In OSS case, the annotation processor does not run. We fall back on creating this by hand
-      Class<? extends NativeModule>[] moduleList =
-          new Class[] {
-            JSCHeapCapture.class, JSDevSupport.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(
-                reactModule.name(),
-                moduleClass.getName(),
-                reactModule.canOverrideExistingModule(),
-                reactModule.needsEagerInit(),
-                reactModule.hasConstants(),
-                reactModule.isCxxModule(),
-                TurboModule.class.isAssignableFrom(moduleClass)));
-      }
-
-      return new ReactModuleInfoProvider() {
-        @Override
-        public Map<String, ReactModuleInfo> getReactModuleInfos() {
-          return reactModuleInfoMap;
-        }
-      };
-    } catch (InstantiationException e) {
-      throw new RuntimeException(
-          "No ReactModuleInfoProvider for DebugCorePackage$$ReactModuleInfoProvider", e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(
-          "No ReactModuleInfoProvider for DebugCorePackage$$ReactModuleInfoProvider", e);
-    }
+    return new com.facebook.react.DebugCorePackage$$ReactModuleInfoProvider();
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
@@ -85,6 +85,7 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/tags:tags"),
     ],
     exported_deps = [
+        react_native_target("java/com/facebook/react/module/model:model"),
         react_native_dep("java/com/facebook/proguard/annotations:annotations"),
         react_native_dep("third-party/java/jsr-330:jsr-330"),
     ],

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.java
@@ -9,6 +9,7 @@
 
 import androidx.annotation.NonNull;
 import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.module.model.BaseNativeModule;
 
 /**
  * A native module whose API can be provided to JS catalyst instances. {@link NativeModule}s whose
@@ -18,7 +19,7 @@
  * themselves using {@link CxxModuleWrapper}.
  */
 @DoNotStrip
-public interface NativeModule {
+public interface NativeModule extends BaseNativeModule {
   interface NativeMethod {
     void invoke(JSInstance jsInstance, ReadableArray parameters);
 

diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/annotations/BUCK
@@ -1,16 +1,13 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 
 rn_android_library(
     name = "annotations",
-    srcs = glob(["**/*.java"]),
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
     ],
-    deps = [
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react/bridge:interfaces"),
+    exported_deps = [
+        "//android/annotations/src/main/java/com/facebook/react/module/annotations:annotations",
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/model/BUCK
@@ -1,13 +1,12 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_android_library")
 
 rn_android_library(
     name = "model",
-    srcs = glob(["**/*.java"]),
     labels = ["supermodule:xplat/default/public.react_native.infra"],
     visibility = [
         "PUBLIC",
     ],
-    deps = [
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
+    exported_deps = [
+        "//android/annotations/src/main/java/com/facebook/react/module/model:model",
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/module/processing/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_java_annotation_processor", "rn_java_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "rn_java_annotation_processor")
 
 rn_java_annotation_processor(
     name = "processing",
@@ -8,22 +8,7 @@ rn_java_annotation_processor(
         "PUBLIC",
     ],
     deps = [
-        ":processing-lib",
+        "//android/annotations-compiler/src/main/java/com/facebook/react/module/processing:processing",
     ],
 )
 
-rn_java_library(
-    name = "processing-lib",
-    srcs = glob(["*.java"]),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
-    source = "8",
-    target = "8",
-    deps = [
-        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
-        react_native_dep("third-party/java/javapoet:javapoet"),
-        react_native_dep("third-party/java/jsr-305:jsr-305"),
-        react_native_target("java/com/facebook/react/module/annotations:annotations"),
-        react_native_target("java/com/facebook/react/module/model:model"),
-        react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
-    ],
-)
diff --git a/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK b/ReactAndroid/src/main/third-party/java/infer-annotations/BUCK
@@ -4,7 +4,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
 rn_prebuilt_jar(
     name = "infer-annotations",
     binary_jar = ":infer-annotations.jar",
-    visibility = ["//ReactAndroid/..."],
+    visibility = ["//ReactAndroid/...", "//android/..."],
 )
 
 fb_native.remote_file(

diff --git a/ReactAndroid/src/main/third-party/java/javapoet/BUCK b/ReactAndroid/src/main/third-party/java/javapoet/BUCK
@@ -4,7 +4,7 @@ load("//tools/build_defs/oss:rn_defs.bzl", "rn_prebuilt_jar")
 rn_prebuilt_jar(
     name = "javapoet",
     binary_jar = ":jsr305-binary.jar",
-    visibility = ["//ReactAndroid/..."],
+    visibility = ["//ReactAndroid/...", "//android/..."],
 )
 
 fb_native.remote_file(

diff --git a/android/annotations-compiler/build.gradle b/android/annotations-compiler/build.gradle
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+apply plugin: 'java'
+
+sourceSets.configureEach { sourceSet ->
+    tasks.named(sourceSet.compileJavaTaskName).configure {
+        options.annotationProcessorGeneratedSourcesDirectory = file("$buildDir/generated/sources/annotationProcessor/java/${sourceSet.name}")
+    }
+}
+
+java {
+    sourceCompatibility(JavaVersion.VERSION_1_8)
+    targetCompatibility(JavaVersion.VERSION_1_8)
+}
+
+dependencies {
+    implementation('com.squareup:javapoet:1.8.0')
+    implementation('com.facebook.infer.annotation:infer-annotation:0.11.2')
+    implementation(project(':react-native-annotations'))
+}
diff --git a/android/annotations-compiler/src/main/java/com/facebook/react/module/processing/BUCK b/android/annotations-compiler/src/main/java/com/facebook/react/module/processing/BUCK
@@ -0,0 +1,20 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_java_annotation_processor", "rn_java_library")
+
+rn_java_library(
+    name = "processing",
+    srcs = glob(["*.java"]),
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    source = "8",
+    target = "8",
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        react_native_dep("third-party/java/infer-annotations:infer-annotations"),
+        react_native_dep("third-party/java/javapoet:javapoet"),
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        react_native_target("java/com/facebook/react/module/model:model"),
+        react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
+    ],
+)
diff --git a/.../processing/ReactModuleSpecProcessor.java → .../processing/ReactModuleSpecProcessor.java b/.../processing/ReactModuleSpecProcessor.java → .../processing/ReactModuleSpecProcessor.java
diff --git a/...tions-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/...tions-compiler/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+com.facebook.react.module.processing.ReactModuleSpecProcessor