commit | 19543ff7109a3ac8097182aa6611af761b02bd40 | [log] [tgz] |
---|---|---|
author | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Mar 28 11:02:00 2022 +0200 |
committer | Christoffer Adamsen <christofferqa@google.com> | Mon Mar 28 09:25:24 2022 +0000 |
tree | c8aedbf180ff3663480a2052455e16c7b6efddbf | |
parent | 2085df5ff1cc41f0a0aae2f2e5888e6026abf15b [diff] |
Fix kotlin dev test failure Change-Id: I7edd59e9c116787b0d0559377c044e49e1aedc88
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionConfigurationAssertionHandlerKotlinSimpleTest.java b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionConfigurationAssertionHandlerKotlinSimpleTest.java index 3798cfc..fdcb229 100644 --- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionConfigurationAssertionHandlerKotlinSimpleTest.java +++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionConfigurationAssertionHandlerKotlinSimpleTest.java
@@ -59,7 +59,7 @@ @Override protected void configureR8(R8FullTestBuilder builder) { boolean referencesNotNull = - kotlinc.is(KotlinCompilerVersion.KOTLINC_1_6_0) + kotlinc.getCompilerVersion().isGreaterThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_6_0) && !kotlinStdlibAsLibrary && !useJvmAssertions; builder.applyIf(referencesNotNull, b -> b.addDontWarn("org.jetbrains.annotations.NotNull"));