Skip to content

Commit 2367bc6

Browse files
committed
feat: replace deprecated APIs
1 parent 74bfd7f commit 2367bc6

3 files changed

Lines changed: 26 additions & 16 deletions

File tree

packages/react-native/ReactAndroid/build.gradle.kts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -612,13 +612,15 @@ android {
612612

613613
sourceSets {
614614
named("main") {
615-
res.srcDirs(
616-
"src/main/res/devsupport",
617-
"src/main/res/shell",
618-
"src/main/res/views/alert",
619-
"src/main/res/views/modal",
620-
"src/main/res/views/uimanager",
621-
"src/main/res/views/view",
615+
res.directories.addAll(
616+
listOf(
617+
"src/main/res/devsupport",
618+
"src/main/res/shell",
619+
"src/main/res/views/alert",
620+
"src/main/res/views/modal",
621+
"src/main/res/views/uimanager",
622+
"src/main/res/views/view",
623+
)
622624
)
623625
}
624626
}

packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,12 @@ android {
411411
sourceSets {
412412
named("main") {
413413
manifest.srcFile("$hermesDir/android/hermes/src/main/AndroidManifest.xml")
414-
java.srcDirs("$hermesDir/lib/Platform/Intl/java", "$hermesDir/lib/Platform/Unicode/java")
414+
java.directories.addAll(
415+
listOf(
416+
"$hermesDir/lib/Platform/Intl/java",
417+
"$hermesDir/lib/Platform/Unicode/java",
418+
)
419+
)
415420
}
416421
}
417422

packages/rn-tester/android/app/build.gradle.kts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,18 @@ android {
134134
}
135135
sourceSets.named("main") {
136136
// SampleTurboModule.
137-
kotlin.srcDirs(
138-
"$reactNativeDirPath/ReactCommon/react/nativemodule/samples/platform/android",
139-
)
140-
res.setSrcDirs(
141-
listOf(
142-
"src/main/res",
143-
"src/main/public_res",
144-
)
137+
kotlin.directories.add(
138+
"$reactNativeDirPath/ReactCommon/react/nativemodule/samples/platform/android"
145139
)
140+
res.directories.apply {
141+
clear() // Mimics setSrcDirs by wiping out the defaults
142+
addAll(
143+
listOf(
144+
"src/main/res",
145+
"src/main/public_res"
146+
)
147+
)
148+
}
146149
}
147150
}
148151

0 commit comments

Comments
 (0)