From c740965940431e5162600cde395574101ab1e383 Mon Sep 17 00:00:00 2001 From: Rafael Winterhalter Date: Tue, 24 Aug 2021 16:17:14 +0200 Subject: [PATCH] Allow for building without Android SDK. Remove warnings. --- settings.gradle.kts | 7 ++++++- .../creation/bytebuddy/TypeCachingBytecodeGenerator.java | 2 -- .../src/test/kotlin/org/mockito/kotlin/SuspendTest.kt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 0803799cdd..cdaa0e66e3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,6 @@ include("deprecatedPluginsTest", "kotlinTest", "kotlinReleaseCoroutinesTest", "android", - "androidTest", "junit-jupiter", "junitJupiterExtensionTest", "junitJupiterInlineMockMakerExtensionTest", @@ -19,6 +18,12 @@ include("deprecatedPluginsTest", "junitJupiterParallelTest", "osgi-test") +if (System.getenv("ANDROID_SDK_ROOT") != null || File(".local.properties").exists()) { + include("androidTest") +} else { + logger.info("Not including android test project due to missing SDK configuration") +} + rootProject.name = "mockito" val koltinBuildScriptProject = hashSetOf("junitJupiterExtensionTest", "junitJupiterInlineMockMakerExtensionTest") diff --git a/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java b/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java index 625d7b795f..30ed949bf5 100644 --- a/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java +++ b/src/main/java/org/mockito/internal/creation/bytebuddy/TypeCachingBytecodeGenerator.java @@ -5,14 +5,12 @@ package org.mockito.internal.creation.bytebuddy; import java.lang.ref.ReferenceQueue; -import java.util.Objects; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import net.bytebuddy.TypeCache; import org.mockito.mock.SerializableMode; -import org.mockito.stubbing.Answer; class TypeCachingBytecodeGenerator extends ReferenceQueue implements BytecodeGenerator { diff --git a/subprojects/kotlinReleaseCoroutinesTest/src/test/kotlin/org/mockito/kotlin/SuspendTest.kt b/subprojects/kotlinReleaseCoroutinesTest/src/test/kotlin/org/mockito/kotlin/SuspendTest.kt index 85131ac6f8..d42a0c0006 100644 --- a/subprojects/kotlinReleaseCoroutinesTest/src/test/kotlin/org/mockito/kotlin/SuspendTest.kt +++ b/subprojects/kotlinReleaseCoroutinesTest/src/test/kotlin/org/mockito/kotlin/SuspendTest.kt @@ -5,8 +5,8 @@ package org.mockito.kotlin import kotlinx.coroutines.runBlocking +import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.core.IsEqual -import org.junit.Assert.assertThat import org.junit.Test import org.mockito.Mockito.*