From 4591caae6607287ce38a83d019a986a16b1f8436 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Wed, 16 Nov 2022 20:47:58 +0100 Subject: [PATCH] remove unused dependencies --- .../kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts | 1 - .../mockk/proxy/jvm/transformation/InliningClassTransformer.kt | 3 +-- .../mockk/proxy/jvm/transformation/SubclassInstrumentation.kt | 1 - modules/mockk-android/build.gradle.kts | 2 -- .../src/jvmMain/kotlin/io/mockk/core/ValueClassSupport.kt | 1 - .../src/commonMain/kotlin/io/mockk/impl/InternalPlatform.kt | 3 +-- .../io/mockk/impl/recording/states/VerifyingStateTest.kt | 1 - .../mockk/src/commonTest/kotlin/io/mockk/it/SealedClassTest.kt | 2 -- .../src/commonTest/kotlin/io/mockk/it/SealedInterfaceTest.kt | 2 -- .../commonTest/kotlin/io/mockk/it/VerificationErrorsTest.kt | 1 - modules/mockk/src/commonTest/kotlin/io/mockk/it/VerifyTest.kt | 2 -- .../jvmTest/kotlin/io/mockk/it/JvmConstructorOverridenTest.kt | 1 - .../mockk/src/jvmTest/kotlin/io/mockk/junit4/MockKRuleTest.kt | 2 -- 13 files changed, 2 insertions(+), 20 deletions(-) diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts index aaa58c784..9258aba2e 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts @@ -1,6 +1,5 @@ package buildsrc.convention -import buildsrc.config.Deps import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget plugins { diff --git a/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/InliningClassTransformer.kt b/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/InliningClassTransformer.kt index 3a3c96bba..d43b476f6 100644 --- a/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/InliningClassTransformer.kt +++ b/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/InliningClassTransformer.kt @@ -1,7 +1,6 @@ package io.mockk.proxy.jvm.transformation import io.mockk.proxy.MockKAgentLogger -import io.mockk.proxy.MockKInvocationHandler import io.mockk.proxy.common.transformation.ClassTransformationSpecMap import io.mockk.proxy.jvm.advice.ProxyAdviceId import io.mockk.proxy.jvm.advice.jvm.JvmMockKConstructorProxyAdvice @@ -146,4 +145,4 @@ internal class InliningClassTransformer( companion object { val classDumpIndex = AtomicLong(); } -} \ No newline at end of file +} diff --git a/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/SubclassInstrumentation.kt b/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/SubclassInstrumentation.kt index 2772aecd0..45e9d6015 100644 --- a/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/SubclassInstrumentation.kt +++ b/modules/mockk-agent/src/jvmMain/kotlin/io/mockk/proxy/jvm/transformation/SubclassInstrumentation.kt @@ -1,7 +1,6 @@ package io.mockk.proxy.jvm.transformation import io.mockk.proxy.MockKAgentLogger -import io.mockk.proxy.MockKInvocationHandler import io.mockk.proxy.jvm.ClassLoadingStrategyChooser import io.mockk.proxy.jvm.advice.ProxyAdviceId import io.mockk.proxy.jvm.advice.jvm.JvmMockKProxyInterceptor diff --git a/modules/mockk-android/build.gradle.kts b/modules/mockk-android/build.gradle.kts index ffbcf917b..6b05a7631 100644 --- a/modules/mockk-android/build.gradle.kts +++ b/modules/mockk-android/build.gradle.kts @@ -1,5 +1,3 @@ -import buildsrc.config.Deps - plugins { buildsrc.convention.`android-library` diff --git a/modules/mockk-core/src/jvmMain/kotlin/io/mockk/core/ValueClassSupport.kt b/modules/mockk-core/src/jvmMain/kotlin/io/mockk/core/ValueClassSupport.kt index a8a52615c..ca511b721 100644 --- a/modules/mockk-core/src/jvmMain/kotlin/io/mockk/core/ValueClassSupport.kt +++ b/modules/mockk-core/src/jvmMain/kotlin/io/mockk/core/ValueClassSupport.kt @@ -3,7 +3,6 @@ package io.mockk.core import kotlin.reflect.KClass import kotlin.reflect.KProperty1 import kotlin.reflect.full.declaredMemberProperties -import kotlin.reflect.full.primaryConstructor import kotlin.reflect.jvm.isAccessible import kotlin.reflect.jvm.javaField import kotlin.reflect.jvm.internal.KotlinReflectionInternalError diff --git a/modules/mockk/src/commonMain/kotlin/io/mockk/impl/InternalPlatform.kt b/modules/mockk/src/commonMain/kotlin/io/mockk/impl/InternalPlatform.kt index 5e987041a..614fef447 100644 --- a/modules/mockk/src/commonMain/kotlin/io/mockk/impl/InternalPlatform.kt +++ b/modules/mockk/src/commonMain/kotlin/io/mockk/impl/InternalPlatform.kt @@ -1,7 +1,6 @@ package io.mockk.impl import io.mockk.StackElement -import kotlin.reflect.KCallable import kotlin.reflect.KClass expect object InternalPlatform { @@ -56,4 +55,4 @@ interface MultiNotifier { fun close() } -} \ No newline at end of file +} diff --git a/modules/mockk/src/commonTest/kotlin/io/mockk/impl/recording/states/VerifyingStateTest.kt b/modules/mockk/src/commonTest/kotlin/io/mockk/impl/recording/states/VerifyingStateTest.kt index b730ee66e..5c65fa9e3 100644 --- a/modules/mockk/src/commonTest/kotlin/io/mockk/impl/recording/states/VerifyingStateTest.kt +++ b/modules/mockk/src/commonTest/kotlin/io/mockk/impl/recording/states/VerifyingStateTest.kt @@ -5,7 +5,6 @@ import io.mockk.MockKGateway.* import io.mockk.impl.recording.CommonCallRecorder import io.mockk.impl.recording.VerificationCallSorter import kotlin.test.BeforeTest -import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertFailsWith diff --git a/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedClassTest.kt b/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedClassTest.kt index 631532156..02ff6b0f7 100644 --- a/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedClassTest.kt +++ b/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedClassTest.kt @@ -2,8 +2,6 @@ package io.mockk.it import io.mockk.every import io.mockk.mockk -import org.junit.jupiter.api.condition.DisabledForJreRange -import org.junit.jupiter.api.condition.JRE import kotlin.test.Test import kotlin.test.assertEquals diff --git a/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedInterfaceTest.kt b/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedInterfaceTest.kt index 5001fe6aa..8cd53d5d0 100644 --- a/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedInterfaceTest.kt +++ b/modules/mockk/src/commonTest/kotlin/io/mockk/it/SealedInterfaceTest.kt @@ -2,8 +2,6 @@ package io.mockk.it import io.mockk.every import io.mockk.mockk -import org.junit.jupiter.api.condition.DisabledForJreRange -import org.junit.jupiter.api.condition.JRE import kotlin.test.Test import kotlin.test.assertEquals diff --git a/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerificationErrorsTest.kt b/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerificationErrorsTest.kt index 00af909e9..660771899 100644 --- a/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerificationErrorsTest.kt +++ b/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerificationErrorsTest.kt @@ -1,7 +1,6 @@ package io.mockk.it import io.mockk.* -import io.mockk.test.SkipInstrumentedAndroidTest import kotlin.test.Test import kotlin.test.fail diff --git a/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerifyTest.kt b/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerifyTest.kt index 85711c0d7..e1448d45c 100644 --- a/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerifyTest.kt +++ b/modules/mockk/src/commonTest/kotlin/io/mockk/it/VerifyTest.kt @@ -5,10 +5,8 @@ import io.mockk.just import io.mockk.mockk import io.mockk.runs import io.mockk.verify -import io.mockk.verifyAll import io.mockk.verifyOrder import io.mockk.verifySequence -import kotlin.test.Ignore import kotlin.test.Test import kotlin.test.assertEquals diff --git a/modules/mockk/src/jvmTest/kotlin/io/mockk/it/JvmConstructorOverridenTest.kt b/modules/mockk/src/jvmTest/kotlin/io/mockk/it/JvmConstructorOverridenTest.kt index ef9957e79..8100927c1 100644 --- a/modules/mockk/src/jvmTest/kotlin/io/mockk/it/JvmConstructorOverridenTest.kt +++ b/modules/mockk/src/jvmTest/kotlin/io/mockk/it/JvmConstructorOverridenTest.kt @@ -4,7 +4,6 @@ import io.mockk.clearAllMocks import io.mockk.mockk import io.mockk.unmockkAll import org.junit.jupiter.api.Test -import org.junit.jupiter.api.Disabled /** * The mocked ::class.java constructor is overriden in the JVM. diff --git a/modules/mockk/src/jvmTest/kotlin/io/mockk/junit4/MockKRuleTest.kt b/modules/mockk/src/jvmTest/kotlin/io/mockk/junit4/MockKRuleTest.kt index 96b904da7..89b18a908 100644 --- a/modules/mockk/src/jvmTest/kotlin/io/mockk/junit4/MockKRuleTest.kt +++ b/modules/mockk/src/jvmTest/kotlin/io/mockk/junit4/MockKRuleTest.kt @@ -9,8 +9,6 @@ import io.mockk.impl.annotations.SpyK import io.mockk.verify import org.junit.Rule import org.junit.Test -import org.junit.runner.RunWith -import org.junit.runners.JUnit4 import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue