From 1d1e6a8802e4db71cecc3142cac3a0cb0e7f1ae2 Mon Sep 17 00:00:00 2001 From: Mattia Tommasone Date: Wed, 27 Jul 2022 17:54:05 +0200 Subject: [PATCH] Changes for release 1.12.5 --- MAINTAINING.md | 3 ++- agent/android/api/mockk-agent-android.api | 5 ++--- agent/jvm/api/mockk-agent-jvm.api | 5 ++--- dsl/jvm/api/mockk-dsl-jvm.api | 2 ++ gradle.properties | 2 +- mockk/jvm/api/mockk-jvm.api | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/MAINTAINING.md b/MAINTAINING.md index 296bbe4d8..8fdd5ce47 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -15,7 +15,8 @@ - [ ] commit it - [ ] tag it - [ ] redirect release process to oss.sonatype by removing the `localrepo` property in gradle.properties - - [ ] release from Gradle + - [ ] set `org.gradle.parallel=true` in `gradle.properties`: apparently, sonatype does not like parallel builds + - [ ] release from Gradle with `gradle publish` - [ ] goto oss.sonatype - [ ] find io.mockk repo - [ ] check state of dependencies (are sizes okay), maybe download one diff --git a/agent/android/api/mockk-agent-android.api b/agent/android/api/mockk-agent-android.api index 383c2e28b..4ac44056a 100644 --- a/agent/android/api/mockk-agent-android.api +++ b/agent/android/api/mockk-agent-android.api @@ -1,7 +1,6 @@ public final class io/mockk/ValueClassSupportKt { - public static final fun boxedClass (Ljava/lang/Object;)Lkotlin/reflect/KClass; - public static final fun boxedClass (Lkotlin/reflect/KClass;)Lkotlin/reflect/KClass; - public static final fun boxedValue (Ljava/lang/Object;)Ljava/lang/Object; + public static final fun getBoxedClass (Lkotlin/reflect/KClass;)Lkotlin/reflect/KClass; + public static final fun getBoxedValue (Ljava/lang/Object;)Ljava/lang/Object; } public final class io/mockk/proxy/android/AndroidMockKAgentFactory : io/mockk/proxy/MockKAgentFactory { diff --git a/agent/jvm/api/mockk-agent-jvm.api b/agent/jvm/api/mockk-agent-jvm.api index 01c9d9979..f6faa7f05 100644 --- a/agent/jvm/api/mockk-agent-jvm.api +++ b/agent/jvm/api/mockk-agent-jvm.api @@ -1,7 +1,6 @@ public final class io/mockk/ValueClassSupportKt { - public static final fun boxedClass (Ljava/lang/Object;)Lkotlin/reflect/KClass; - public static final fun boxedClass (Lkotlin/reflect/KClass;)Lkotlin/reflect/KClass; - public static final fun boxedValue (Ljava/lang/Object;)Ljava/lang/Object; + public static final fun getBoxedClass (Lkotlin/reflect/KClass;)Lkotlin/reflect/KClass; + public static final fun getBoxedValue (Ljava/lang/Object;)Ljava/lang/Object; } public class io/mockk/proxy/jvm/ClassLoadingStrategyChooser { diff --git a/dsl/jvm/api/mockk-dsl-jvm.api b/dsl/jvm/api/mockk-dsl-jvm.api index 88895c61b..7b26ec1ce 100644 --- a/dsl/jvm/api/mockk-dsl-jvm.api +++ b/dsl/jvm/api/mockk-dsl-jvm.api @@ -311,6 +311,7 @@ public abstract interface class io/mockk/InternalCounter { public final class io/mockk/InternalPlatformDsl { public static final field INSTANCE Lio/mockk/InternalPlatformDsl; + public final fun boxCast (Lkotlin/reflect/KClass;Ljava/lang/Object;)Ljava/lang/Object; public final fun classForName (Ljava/lang/String;)Ljava/lang/Object; public final fun coroutineCall (Lkotlin/jvm/functions/Function1;)Lio/mockk/CoroutineCall; public final fun counter ()Lio/mockk/InternalCounter; @@ -326,6 +327,7 @@ public final class io/mockk/InternalPlatformDsl { public final fun toArray (Ljava/lang/Object;)[Ljava/lang/Object; public final fun toStr (Ljava/lang/Object;)Ljava/lang/String; public final fun unboxChar (Ljava/lang/Object;)Ljava/lang/Object; + public final fun unboxClass (Lkotlin/reflect/KClass;)Lkotlin/reflect/KClass; } public abstract interface class io/mockk/InternalRef { diff --git a/gradle.properties b/gradle.properties index 92d134c1b..5fc4f07e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.12.5 +version=1.12.6-SNAPSHOT # Enable Gradle build cache https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching=true org.gradle.configureondemand=false diff --git a/mockk/jvm/api/mockk-jvm.api b/mockk/jvm/api/mockk-jvm.api index e9df09df6..068b1f553 100644 --- a/mockk/jvm/api/mockk-jvm.api +++ b/mockk/jvm/api/mockk-jvm.api @@ -756,7 +756,7 @@ public final class io/mockk/impl/recording/JvmAutoHinter$Companion { public final class io/mockk/impl/recording/JvmSignatureValueGenerator : io/mockk/impl/recording/SignatureValueGenerator { public fun (Ljava/util/Random;)V public final fun getRnd ()Ljava/util/Random; - public fun signatureValue (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; + public fun signatureValue (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;Lio/mockk/impl/instantiation/AbstractInstantiator;)Ljava/lang/Object; } public final class io/mockk/impl/recording/PermanentMocker { @@ -778,7 +778,7 @@ public final class io/mockk/impl/recording/SignatureMatcherDetector { } public abstract interface class io/mockk/impl/recording/SignatureValueGenerator { - public abstract fun signatureValue (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object; + public abstract fun signatureValue (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;Lio/mockk/impl/instantiation/AbstractInstantiator;)Ljava/lang/Object; } public final class io/mockk/impl/recording/SignedCall {