File tree Expand file tree Collapse file tree 3 files changed +2
-22
lines changed Expand file tree Collapse file tree 3 files changed +2
-22
lines changed Original file line number Diff line number Diff line change @@ -297,23 +297,6 @@ android.applicationVariants.all { variant ->
297
297
298
298
}
299
299
300
- configurations {
301
- // There's an interaction between Gradle's resolution of dependencies with different types
302
- // (@jar, @aar) for `implementation` and `testImplementation` and with Android Studio's built-in
303
- // JUnit test runner. The runtime classpath in the built-in JUnit test runner gets the
304
- // dependency from the `implementation`, which is type @aar, and therefore the JNA dependency
305
- // doesn't provide the JNI dispatch libraries in the correct Java resource directories. I think
306
- // what's happening is that @aar type in `implementation` resolves to the @jar type in
307
- // `testImplementation`, and that it wins the dependency resolution battle.
308
- //
309
- // A workaround is to add a new configuration which depends on the @jar type and to reference
310
- // the underlying JAR file directly in `testImplementation`. This JAR file doesn't resolve to
311
- // the @aar type in `implementation`. This works when invoked via `gradle`, but also sets the
312
- // correct runtime classpath when invoked with Android Studio's built-in JUnit test runner.
313
- // Success!
314
- jnaForTest
315
- }
316
-
317
300
// [Midori] try to exclude all telemetry dependencies
318
301
configurations. all {
319
302
// Telemetry is a transitive dependency of several necessary dependencies,
@@ -329,9 +312,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
329
312
330
313
dependencies {
331
314
332
- jnaForTest Deps . jna
333
- testImplementation files(configurations. jnaForTest. copyRecursive(). files)
334
-
335
315
implementation Deps . mozilla_browser_engine_gecko
336
316
337
317
implementation Deps . kotlin_stdlib
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ org.gradle.parallel=true
15
15
kotlin.code.style =official
16
16
android.useAndroidX =true
17
17
android.enableJetifier =false
18
- org.gradle.configuration-cache =true
18
+ # org.gradle.configuration-cache=true
19
19
# Enables copying of Jetpack Benchmark results from the device to the build directory.
20
20
android.enableAdditionalTestOutput =true
21
21
android.nonTransitiveRClass =false
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
distributionPath =wrapper/dists
3
- distributionUrl =https\://services.gradle.org/distributions/gradle-8.6 -bin.zip
3
+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.11 -bin.zip
4
4
networkTimeout =10000
5
5
validateDistributionUrl =true
6
6
zipStoreBase =GRADLE_USER_HOME
You can’t perform that action at this time.
0 commit comments