Merge pull request #840 from c00ler/master

Build logic improvements

agent/jvm/build.gradle

@@ -23,20 +23,31 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 }
 
-task copyMockKDispatcher(type: Copy) {
-    dependsOn compileJava
-    dependsOn compileKotlin
-    from "${sourceSets.main.java.outputDir}/io/mockk/proxy/jvm/dispatcher"
-    into "${sourceSets.main.java.outputDir}/io/mockk/proxy/jvm/dispatcher"
-    include "JvmMockKDispatcher.class"
-    include "JvmMockKWeakMap.class"
-    include "JvmMockKWeakMap\$StrongKey.class"
-    include "JvmMockKWeakMap\$WeakKey.class"
-    rename { String fileName ->
-        fileName.replace('.class', '.clazz')
+def copyMockKDispatcher =
+    tasks.register("copyMockKDispatcher", Copy) {
+        dependsOn compileJava
+        dependsOn compileKotlin
+
+        def mockKDispatcherDir =
+            sourceSets.main.java.classesDirectory
+                .map { "$it/io/mockk/proxy/jvm/dispatcher" }
+
+        from(mockKDispatcherDir) {
+            include "JvmMockKDispatcher.class"
+            include "JvmMockKWeakMap.class"
+            include "JvmMockKWeakMap\$StrongKey.class"
+            include "JvmMockKWeakMap\$WeakKey.class"
+
+            rename { String fileName ->
+                fileName.replace('.class', '.clazz')
+            }
+        }
+        into mockKDispatcherDir
     }
+
+tasks.named("classes") {
+    dependsOn copyMockKDispatcher
 }
-classes.dependsOn(copyMockKDispatcher)
 
 jar {
     exclude "io/mockk/proxy/jvm/dispatcher/JvmMockKDispatcher.class"

dsl/jvm/api/mockk-dsl-jvm.api

@@ -543,6 +543,7 @@ public final class io/mockk/MockKConstructorScope : io/mockk/MockKUnmockKScope {
 public final class io/mockk/MockKDsl {
 	public static final field INSTANCE Lio/mockk/MockKDsl;
 	public final fun internalCheckExactlyAtMostAtLeast (IIILio/mockk/Ordering;)V
+	public final fun internalCheckUnnecessaryStub ([Ljava/lang/Object;)V
 	public final fun internalClearAllMocks (ZZZZZZZZZ)V
 	public static synthetic fun internalClearAllMocks$default (Lio/mockk/MockKDsl;ZZZZZZZZZILjava/lang/Object;)V
 	public final fun internalClearConstructorMockk ([Lkotlin/reflect/KClass;ZZZZZ)V
@@ -756,6 +757,8 @@ public abstract interface class io/mockk/MockKGateway$Stubber {
 public abstract interface class io/mockk/MockKGateway$VerificationAcknowledger {
 	public abstract fun acknowledgeVerified ()V
 	public abstract fun acknowledgeVerified (Ljava/lang/Object;)V
+	public abstract fun checkUnnecessaryStub ()V
+	public abstract fun checkUnnecessaryStub (Ljava/lang/Object;)V
 	public abstract fun markCallVerified (Lio/mockk/Invocation;)V
 }
 

gradle.properties

@@ -1,4 +1,5 @@
 version=1.12.5-SNAPSHOT
+org.gradle.parallel=true
 org.gradle.configureondemand=false
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=768m
 # localrepo=build/mockk-repo

gradle/jacoco.gradle

@@ -7,8 +7,8 @@ jacoco {
 afterEvaluate {
     jacocoTestReport {
         reports {
-            xml.enabled = true
-            html.enabled = true
+            xml.required = true
+            html.required = true
         }
         afterEvaluate {
             classDirectories.from(files(classDirectories.files.collect {
@@ -23,4 +23,4 @@ afterEvaluate {
     }
 
     check.dependsOn jacocoTestReport
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists