Skip to content

Commit 5bb289b

Browse files
committed
fix: Replaced deprecated code and fixed some warnings
1 parent 0aa8db5 commit 5bb289b

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

src/main/kotlin/dev/matrix/agp/rust/AndroidRustExtension.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ annotation class AndroidRustDslMarker
99
@Suppress("unused")
1010
open class AndroidRustExtension : AndroidRustConfiguration() {
1111
/**
12-
* Specify minimum supported rust version.
12+
* Specify minimum supported Rust version.
1313
*
1414
* Plugin will automatically use `rustup update` command to
1515
* update rust version in case installed versions is not high enough.
1616
*/
1717
var minimumSupportedRustVersion = ""
1818

1919
/**
20-
* Configuration map of all rust libraries to build.
20+
* Configuration map of all Rust libraries to build.
2121
*
22-
* Keys of this map are rust crates names.
22+
* Keys of this map are Rust crates names.
2323
*/
2424
var modules = mutableMapOf<String, AndroidRustModule>()
2525

2626
/**
27-
* Configure rust module/library to build.
27+
* Configure Rust module/library to build.
2828
*
2929
* @param name Rust crate name.
3030
*/
@@ -37,7 +37,7 @@ open class AndroidRustExtension : AndroidRustConfiguration() {
3737
@Suppress("unused")
3838
class AndroidRustModule : AndroidRustConfiguration() {
3939
/**
40-
* Path to the rust project folder.
40+
* Path to the Rust project folder.
4141
*
4242
* This is the folder containing `Cargo.toml` file.
4343
*/
@@ -46,22 +46,21 @@ class AndroidRustModule : AndroidRustConfiguration() {
4646
/**
4747
* All supported build type configurations.
4848
*
49-
* Keys of this map should correspond to this project's build variants.
49+
* Keys of this map should correspond to the current project build variants.
5050
*/
5151
var buildTypes = hashMapOf(
5252
"debug" to AndroidRustBuildType().also {
5353
it.profile = "dev"
5454
},
5555
"release" to AndroidRustBuildType().also {
5656
it.profile = "release"
57-
it.disableAbiOptimization = true
5857
},
5958
)
6059

6160
/**
62-
* Configure rust build options.
61+
* Configure Rust build options.
6362
*
64-
* @param name this project's build variant.
63+
* @param name current project build variant.
6564
*/
6665
fun buildType(name: String, configure: AndroidRustBuildType.() -> Unit) {
6766
buildTypes.getOrPut(name, ::AndroidRustBuildType).configure()

src/main/kotlin/dev/matrix/agp/rust/AndroidRustPlugin.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ abstract class AndroidRustPlugin @Inject constructor(
3333
val allRustAbiSet = mutableSetOf<Abi>()
3434
val ndkDirectory = androidExtension.ndkDirectory
3535
val ndkVersion = SemanticVersion(androidExtension.ndkVersion)
36-
val extensionBuildDirectory = File(project.buildDir, "intermediates/rust")
36+
val extensionBuildDirectory = project.layout.buildDirectory.dir("intermediates/rust").get().asFile
3737

3838
for (buildType in dsl.buildTypes) {
39-
val buildTypeNameCap = buildType.name.capitalize(Locale.getDefault())
39+
val buildTypeNameCap = buildType.name.replaceFirstChar(Char::titlecase)
4040

4141
val variantBuildDirectory = File(extensionBuildDirectory, buildType.name)
4242
val variantJniLibsDirectory = File(variantBuildDirectory, "jniLibs")
@@ -47,7 +47,7 @@ abstract class AndroidRustPlugin @Inject constructor(
4747
}
4848

4949
for ((moduleName, module) in extension.modules) {
50-
val moduleNameCap = moduleName.capitalize(Locale.getDefault())
50+
val moduleNameCap = moduleName.replaceFirstChar(Char::titlecase)
5151
val moduleBuildDirectory = File(variantBuildDirectory, "lib_$moduleName")
5252

5353
val rustBuildType = module.buildTypes[buildType.name]
@@ -101,7 +101,7 @@ abstract class AndroidRustPlugin @Inject constructor(
101101

102102
androidComponents.onVariants { variant ->
103103
val tasks = tasksByBuildType[variant.buildType] ?: return@onVariants
104-
val variantName = variant.name.capitalize(Locale.getDefault())
104+
val variantName = variant.name.replaceFirstChar(Char::titlecase)
105105

106106
project.afterEvaluate {
107107
val parentTask = project.tasks.getByName("pre${variantName}Build")

0 commit comments

Comments
 (0)