Skip to content

Commit 159214e

Browse files
authored
Merge pull request #68 from lupuuss/release/2.6.1
Release/2.6.1
2 parents a4d1684 + fdd7d9c commit 159214e

File tree

7 files changed

+31
-6
lines changed

7 files changed

+31
-6
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ kotlin.code.style=official
33
kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
44
kotlin.native.ignoreDisabledTargets=true
55
org.gradle.jvmargs=-Xmx3g
6-
version=2.6.0-SNAPSHOT
6+
version=2.6.1-SNAPSHOT
77
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

mokkery-plugin/src/main/kotlin/dev/mokkery/plugin/ir/IrBuilderWithScope.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import dev.mokkery.plugin.core.getFunction
99
import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
1010
import org.jetbrains.kotlin.backend.common.lower.irIfThen
1111
import org.jetbrains.kotlin.backend.common.lower.irNot
12+
import org.jetbrains.kotlin.backend.jvm.ir.eraseTypeParameters
1213
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
1314
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
1415
import org.jetbrains.kotlin.ir.builders.IrBlockBodyBuilder
@@ -101,7 +102,7 @@ fun IrBlockBodyBuilder.irDelegatingDefaultConstructorOrAny(
101102
val provideCall = irCall(autofillFun) {
102103
type = it.type
103104
putTypeArgument(0, it.type)
104-
putValueArgument(0, kClassReference(it.type))
105+
putValueArgument(0, kClassReference(it.type.eraseTypeParameters()))
105106
}
106107
putArgument(it, provideCall)
107108
}

test-mokkery/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlinVersion=2.1.0
2-
mokkeryVersion=2.6.0-SNAPSHOT
2+
mokkeryVersion=2.6.1-SNAPSHOT
33
mokkeryAllowIndirectSuperCalls=true
44
org.gradle.jvmargs=-Xmx1g
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package dev.mokkery.test
2+
3+
abstract class AbstractGenericClassArgsConstructor<T>(open val value: T)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package dev.mokkery.test.types
2+
3+
import dev.mokkery.answering.returns
4+
import dev.mokkery.every
5+
import dev.mokkery.mock
6+
import dev.mokkery.test.AbstractGenericClassArgsConstructor
7+
import dev.mokkery.verify
8+
import kotlin.test.Test
9+
import kotlin.test.assertEquals
10+
11+
class MocksAbstractGenericClassArgsConstructorTest {
12+
13+
private val mock = mock<AbstractGenericClassArgsConstructor<Int>>()
14+
15+
@Test
16+
fun testValue() {
17+
every { mock.value } returns 1
18+
assertEquals(1, mock.value)
19+
verify { mock.value }
20+
}
21+
}

website/docs/Setup.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import Admonition from '@theme/Admonition';
2929
```kotlin
3030
plugins {
3131
kotlin("multiplatform") version "2.1.0" // ...or any other Kotlin plugin
32-
id("dev.mokkery") version "2.6.0"
32+
id("dev.mokkery") version "2.6.1"
3333
}
3434
```
3535
</TabItem>
@@ -161,7 +161,7 @@ You can refer to [this file](https://github.com/lupuuss/Mokkery/blob/master/buil
161161
</Admonition>
162162
| Mokkery version | Supported Kotlin versions |
163163
|------------------------------------|--------------------------------------------------------|
164-
| 2.6.0 | 2.1.0 |
164+
| 2.6.0 - 2.6.1 | 2.1.0 |
165165
| 2.3.0 - 2.5.1 | 2.0.0 - 2.0.21 |
166166
| 2.0.0 – 2.2.0 | 2.0.0 - 2.0.10 |
167167
</TabItem>

website/src/versions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export const kotlinVersion = "2.1.0"
2-
export const mokkeryVersion = "2.6.0"
2+
export const mokkeryVersion = "2.6.1"

0 commit comments

Comments
 (0)