diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/build.gradle | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | utils/src/main/java/org/robolectric/util/Util.java | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/utils/build.gradle b/utils/build.gradle index c10cca279..c3cd96c44 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.robolectric.gradle.DeployedRoboJavaModulePlugin import org.robolectric.gradle.RoboJavaModulePlugin @@ -13,7 +14,7 @@ spotless { } } -tasks.withType(GenerateModuleMetadata) { +tasks.withType(GenerateModuleMetadata).configureEach { // We don't want to release gradle module metadata now to avoid // potential compatibility problems. enabled = false @@ -26,7 +27,7 @@ compileKotlin { // in production. If utils module starts to add Kotlin code in main source // set, we can remove this destinationDirectory modification. destinationDirectory = file("${projectDir}/build/classes/java/main") - compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8 + compilerOptions.jvmTarget = JvmTarget.JVM_1_8 } afterEvaluate { @@ -60,8 +61,7 @@ dependencies { testAnnotationProcessor "com.google.errorprone:error_prone_core:$errorproneVersion" implementation "com.google.errorprone:error_prone_annotations:$errorproneVersion" - testImplementation "junit:junit:${junitVersion}" - testImplementation "com.google.truth:truth:${truthVersion}" + testImplementation "junit:junit:$junitVersion" + testImplementation "com.google.truth:truth:$truthVersion" testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" - testImplementation "org.mockito:mockito-core:${mockitoVersion}" } diff --git a/utils/src/main/java/org/robolectric/util/Util.java b/utils/src/main/java/org/robolectric/util/Util.java index b7292ad93..b7292ad93 100755..100644 --- a/utils/src/main/java/org/robolectric/util/Util.java +++ b/utils/src/main/java/org/robolectric/util/Util.java |