From f9ebc1d9edb5b53131b817517cd6cfa0280d78f0 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Fri, 26 Jul 2024 04:51:58 -0700 Subject: [PATCH] Convert com.facebook.annotationprocessor.common.ProcessorBase to Kotlin (#45595) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/45595 Changelog: [Internal][Changed] com.facebook.annotationprocessor.common.ProcessorBase -> Kotlin Reviewed By: tdn120 Differential Revision: D60110313 fbshipit-source-id: 42e51927bc3bd56699c79f2f51293ba68ad7df22 --- .../ReactAndroid/build.gradle.kts | 4 +++- .../common/ProcessorBase.java | 24 ------------------- .../common/ProcessorBase.kt | 23 ++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.java create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.kt diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts index 31af3778976..1be4633d67e 100644 --- a/packages/react-native/ReactAndroid/build.gradle.kts +++ b/packages/react-native/ReactAndroid/build.gradle.kts @@ -11,6 +11,7 @@ import com.facebook.react.tasks.internal.* import com.facebook.react.tasks.internal.utils.* import de.undercouch.gradle.tasks.download.Download import java.nio.file.Paths +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("maven-publish") @@ -656,7 +657,6 @@ android { "src/main/res/views/alert", "src/main/res/views/modal", "src/main/res/views/uimanager")) - java.exclude("com/facebook/annotationprocessors") java.exclude("com/facebook/react/processing") java.exclude("com/facebook/react/module/processing") } @@ -777,6 +777,8 @@ android { } } +tasks.withType().configureEach { exclude("com/facebook/annotationprocessors/**") } + dependencies { api(libs.androidx.appcompat) api(libs.androidx.appcompat.resources) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.java deleted file mode 100644 index 51983ad030e..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.java +++ /dev/null @@ -1,24 +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.annotationprocessors.common; - -import java.util.Set; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.lang.model.element.TypeElement; - -public abstract class ProcessorBase extends AbstractProcessor { - - @Override - public boolean process(Set annotations, RoundEnvironment roundEnv) { - return processImpl(annotations, roundEnv); - } - - protected abstract boolean processImpl( - Set annotations, RoundEnvironment roundEnv); -} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.kt new file mode 100644 index 00000000000..87a228644cc --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/annotationprocessors/common/ProcessorBase.kt @@ -0,0 +1,23 @@ +/* + * 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.annotationprocessors.common + +import javax.annotation.processing.AbstractProcessor +import javax.annotation.processing.RoundEnvironment +import javax.lang.model.element.TypeElement + +public abstract class ProcessorBase : AbstractProcessor() { + + public fun process(annotations: Set?, roundEnv: RoundEnvironment?): Boolean = + processImpl(annotations, roundEnv) + + protected abstract fun processImpl( + annotations: Set?, + roundEnv: RoundEnvironment? + ): Boolean +}