From 477611c8db5878de0e62a190092fbc979a1b6ea8 Mon Sep 17 00:00:00 2001 From: Fabrizio Cucci Date: Tue, 2 Apr 2024 13:43:39 -0700 Subject: [PATCH] Kotlinify InspectorFlags (#43772) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/43772 Changelog: [Internal] As part of the Sustainability Week (see [post](https://fb.workplace.com/groups/251759413609061/permalink/742797531171911/)). Reviewed By: rshest Differential Revision: D55637558 fbshipit-source-id: b0bcbed4790940e52af6ca82c0ee50e6a4fd510c --- .../ReactAndroid/api/ReactAndroid.api | 7 +++-- .../react/devsupport/InspectorFlags.java | 28 ------------------- .../react/devsupport/InspectorFlags.kt | 22 +++++++++++++++ 3 files changed, 26 insertions(+), 31 deletions(-) delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.java create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 7a9c9e7313c..4219a0dc695 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -2164,9 +2164,10 @@ public abstract interface class com/facebook/react/devsupport/HMRClient : com/fa public abstract fun setup (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)V } -public class com/facebook/react/devsupport/InspectorFlags { - public static fun getEnableCxxInspectorPackagerConnection ()Z - public static fun getEnableModernCDPRegistry ()Z +public final class com/facebook/react/devsupport/InspectorFlags { + public static final field INSTANCE Lcom/facebook/react/devsupport/InspectorFlags; + public static final fun getEnableCxxInspectorPackagerConnection ()Z + public static final fun getEnableModernCDPRegistry ()Z } public class com/facebook/react/devsupport/InspectorPackagerConnection : com/facebook/react/devsupport/IInspectorPackagerConnection { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.java deleted file mode 100644 index 05480fb58bf..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.devsupport; - -import com.facebook.infer.annotation.Nullsafe; -import com.facebook.proguard.annotations.DoNotStrip; - -/** JNI wrapper for `jsinspector_modern::InspectorFlags`. */ -@Nullsafe(Nullsafe.Mode.LOCAL) -@DoNotStrip -public class InspectorFlags { - static { - DevSupportSoLoader.staticInit(); - } - - @DoNotStrip - public static native boolean getEnableModernCDPRegistry(); - - @DoNotStrip - public static native boolean getEnableCxxInspectorPackagerConnection(); - - private InspectorFlags() {} -} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt new file mode 100644 index 00000000000..9b01f09c679 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorFlags.kt @@ -0,0 +1,22 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.devsupport + +import com.facebook.proguard.annotations.DoNotStrip + +/** JNI wrapper for `jsinspector_modern::InspectorFlags`. */ +@DoNotStrip +public object InspectorFlags { + init { + DevSupportSoLoader.staticInit() + } + + @DoNotStrip @JvmStatic public external fun getEnableModernCDPRegistry(): Boolean + + @DoNotStrip @JvmStatic public external fun getEnableCxxInspectorPackagerConnection(): Boolean +}