Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run upgrade assistant. #1066

Merged
merged 1 commit into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
agp = "8.4.0"
agp = "8.4.2"
kotlin = "1.9.0"
kotlinxCoroutines = "1.6.4"
junit = "4.13.2"
Expand Down
17 changes: 9 additions & 8 deletions prefab/prefab-publishing/mylibrary/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

plugins {
id 'ndksamples.android.library'
id 'ndksamples.android.library'
}

android {
Expand Down Expand Up @@ -47,13 +47,14 @@ android {
headers "src/main/cpp/include"
}
}

// Avoid packing the unnecessary libraries into final AAR. For details
// refer to https://issuetracker.google.com/issues/168777344#comment5
// Note that if your AAR also contains Java/Kotlin APIs, you should not
// exclude libraries that are used by those APIs.
packagingOptions {
exclude("**/libmylibrary.so")
exclude("**/libc++_shared.so")
// Avoid packing the unnecessary libraries into final AAR. For details
// refer to https://issuetracker.google.com/issues/168777344#comment5
// Note that if your AAR also contains Java/Kotlin APIs, you should not
// exclude libraries that are used by those APIs.
jniLibs {
excludes += ['**/libmylibrary.so', '**/libc++_shared.so']
}
}

}
8 changes: 4 additions & 4 deletions unit-test/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ android {
viewBinding true
prefab true
}

packagingOptions {
// Libraries that are wrongly included in the junit-gtest AAR that will
// end up in our APK if we don't explicitly exclude them.
exclude "**/libadder.so"
exclude "**/libapptest.so"
exclude "**/libc++_shared.so"
jniLibs {
excludes += ['**/libadder.so', '**/libapptest.so', '**/libc++_shared.so']
}
}

}

dependencies {
Expand Down
Loading