Skip to content

Commit 3b3e2a3

Browse files
committed
fix: deprecated APIs
1 parent 24e305f commit 3b3e2a3

2 files changed

Lines changed: 22 additions & 31 deletions

File tree

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ class ReactPlugin : Plugin<Project> {
116116
}
117117

118118
// Library Only Configuration
119-
// configureBuildConfigFieldsForLibraries(project)
120-
// configureNamespaceForLibraries(project)
121119
project.pluginManager.withPlugin("com.android.library") {
120+
configureBuildConfigFieldsForLibraries(project)
121+
configureNamespaceForLibraries(project)
122122
configureCodegen(project, extension, rootExtension, isLibrary = true)
123123
}
124124
}
@@ -222,12 +222,12 @@ class ReactPlugin : Plugin<Project> {
222222
if (isLibrary) {
223223
project.extensions.getByType(LibraryAndroidComponentsExtension::class.java).finalizeDsl { ext
224224
->
225-
ext.sourceSets.getByName("main").java.srcDir(generatedSrcDir.get().dir("java").asFile)
225+
ext.sourceSets.getByName("main").java.directories.add(generatedSrcDir.get().dir("java").asFile.path)
226226
}
227227
} else {
228228
project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java).finalizeDsl {
229229
ext ->
230-
ext.sourceSets.getByName("main").java.srcDir(generatedSrcDir.get().dir("java").asFile)
230+
ext.sourceSets.getByName("main").java.directories.add(generatedSrcDir.get().dir("java").asFile.path)
231231
}
232232
}
233233

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package com.facebook.react.utils
99

1010
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
1111
import com.android.build.api.variant.LibraryAndroidComponentsExtension
12-
import com.android.build.gradle.LibraryExtension
1312
import com.facebook.react.ReactExtension
1413
import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
1514
import com.facebook.react.utils.ProjectUtils.isHermesEnabled
@@ -18,7 +17,6 @@ import java.net.Inet4Address
1817
import java.net.NetworkInterface
1918
import javax.xml.parsers.DocumentBuilder
2019
import javax.xml.parsers.DocumentBuilderFactory
21-
import kotlin.plus
2220
import org.gradle.api.Action
2321
import org.gradle.api.Project
2422
import org.gradle.api.plugins.AppliedPlugin
@@ -77,14 +75,12 @@ internal object AgpConfiguratorUtils {
7775
project.pluginManager.withPlugin("com.android.library", action)
7876
}
7977

80-
fun configureBuildConfigFieldsForLibraries(appProject: Project) {
81-
appProject.rootProject.allprojects { subproject ->
82-
subproject.pluginManager.withPlugin("com.android.library") {
83-
subproject.extensions
84-
.getByType(LibraryAndroidComponentsExtension::class.java)
85-
.finalizeDsl { ext -> ext.buildFeatures.buildConfig = true }
78+
fun configureBuildConfigFieldsForLibraries(project: Project) {
79+
project.extensions
80+
.getByType(LibraryAndroidComponentsExtension::class.java)
81+
.finalizeDsl { ext ->
82+
ext.buildFeatures.buildConfig = true
8683
}
87-
}
8884
}
8985

9086
fun configureDevServerLocation(project: Project) {
@@ -111,27 +107,22 @@ internal object AgpConfiguratorUtils {
111107
project.pluginManager.withPlugin("com.android.library", action)
112108
}
113109

114-
fun configureNamespaceForLibraries(appProject: Project) {
115-
appProject.rootProject.allprojects { subproject ->
116-
subproject.pluginManager.withPlugin("com.android.library") {
117-
subproject.extensions
118-
.getByType(LibraryAndroidComponentsExtension::class.java)
119-
.finalizeDsl { ext ->
120-
if (ext.namespace == null) {
121-
val android = subproject.extensions.getByType(LibraryExtension::class.java)
122-
val manifestFile = android.sourceSets.getByName("main").manifest.srcFile
123-
124-
manifestFile
125-
.takeIf { it.exists() }
126-
?.let { file ->
127-
getPackageNameFromManifest(file)?.let { packageName ->
128-
ext.namespace = packageName
129-
}
130-
}
110+
fun configureNamespaceForLibraries(project: Project) {
111+
project.extensions
112+
.getByType(LibraryAndroidComponentsExtension::class.java)
113+
.finalizeDsl { ext ->
114+
if (ext.namespace == null) {
115+
val manifestFile =
116+
project.layout.projectDirectory.file("src/main/AndroidManifest.xml").asFile
117+
manifestFile
118+
.takeIf { it.exists() }
119+
?.let { file ->
120+
getPackageNameFromManifest(file)?.let { packageName ->
121+
ext.namespace = packageName
131122
}
132123
}
124+
}
133125
}
134-
}
135126
}
136127
}
137128

0 commit comments

Comments
 (0)