build: small fixes related to gradle 8.7 upgrade

This commit is contained in:
thunderbiscuit 2024-04-09 16:15:08 -04:00
parent 78ef936369
commit 0eadff1327
No known key found for this signature in database
GPG Key ID: 88253696EB836462
3 changed files with 9 additions and 0 deletions

View File

@ -105,6 +105,12 @@ afterEvaluate {
}
}
}
// This is required because we must ensure the moveNativeAndroidLibs task is executed after
// the mergeReleaseJniLibFolders (hard requirement introduced by our upgrade to Gradle 8.7)
tasks.named("mergeReleaseJniLibFolders") {
dependsOn(":lib:moveNativeAndroidLibs")
}
}
signing {

View File

@ -113,6 +113,8 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
val moveNativeAndroidLibs by tasks.register<Copy>("moveNativeAndroidLibs") {
dependsOn(buildAndroidAarch64Binary)
dependsOn(buildAndroidArmv7Binary)
dependsOn(buildAndroidX86_64Binary)
into("${project.projectDir}/../lib/src/main/jniLibs/")

View File

@ -13,5 +13,6 @@ pluginManagement {
dependencyResolutionManagement {
repositories {
mavenCentral()
google()
}
}