Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mockk to 1.13.11 #6346

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Update mockk to 1.13.11 #6346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfc01d8
Update mockk to 1.13.11
Pururun Jun 13, 2024
07654fe
Update gradle verification file
Pururun Jun 13, 2024
3a27808
Fix unit test
Pururun Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ class VpnSettingsViewModelTest {
val expectedResistantState = QuantumResistantState.On
val mockSettings: Settings = mockk(relaxed = true)
val mockTunnelOptions: TunnelOptions = mockk(relaxed = true)
val mockWireguardTunnelOptions: WireguardTunnelOptions = mockk(relaxed = true)
// Can not use a mock here since mocking a value class val leads to class cast exception
val mockWireguardTunnelOptions =
WireguardTunnelOptions(mtu = Mtu(0), quantumResistant = expectedResistantState)

every { mockSettings.tunnelOptions } returns mockTunnelOptions
every { mockTunnelOptions.wireguard } returns mockWireguardTunnelOptions
every { mockWireguardTunnelOptions.quantumResistant } returns expectedResistantState
every { mockWireguardTunnelOptions.mtu } returns Mtu(0)
every { mockSettings.relaySettings } returns mockk<RelaySettings>(relaxed = true)

viewModel.uiState.test {
Expand Down
2 changes: 1 addition & 1 deletion android/buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Versions {
const val kotlinCompilerExtensionVersion = "1.5.10"
const val kotlinx = "1.8.0"
const val leakCanary = "2.13"
const val mockk = "1.13.10"
const val mockk = "1.13.11"
const val mockWebserver = "4.12.0"
const val turbine = "1.0.0"
const val billingClient = "6.2.0"
Expand Down
102 changes: 51 additions & 51 deletions android/gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3705,100 +3705,100 @@
<sha256 value="e347fb904bf0dd680902de46cf7aa3000487e316042f2ee09a3af99d30de5705" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk" version="1.13.10">
<artifact name="mockk-1.13.10.module">
<sha256 value="bc9b079ef3ce83a77895c90128c1b29a55ff4accc50567e296ba0859c5e84b76" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk" version="1.13.11">
<artifact name="mockk-1.13.11.module">
<sha256 value="9e067b3804a0c39792a885b9e2bebda0aa39e72e871cab13f318c464fc67b5d7" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-metadata-1.13.10.jar">
<artifact name="mockk-metadata-1.13.11.jar">
<sha256 value="87d4f79e3ba534dfd0f911ea11803a90c4bbdac03b093c832d669b2b3b3fedbf" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-agent" version="1.13.10">
<artifact name="mockk-agent-1.13.10.module">
<sha256 value="65c15ab03fadb82c0304f9ba669cccbaf3dbd0991ecfbce1d094a82c25f4a4af" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-agent" version="1.13.11">
<artifact name="mockk-agent-1.13.11.module">
<sha256 value="4315c976ed22bd1f90ce3950a0f2a32ba1133cd7160b99975ce1c0154c6bb03c" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-agent-metadata-1.13.10.jar">
<artifact name="mockk-agent-metadata-1.13.11.jar">
<sha256 value="825ee154735088d90d9b3bddecc6b6115a7a788c001f9b6ad4b0e4b551a6d11e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-agent-android" version="1.13.10">
<artifact name="mockk-agent-android-1.13.10.aar">
<component group="io.mockk" name="mockk-agent-android" version="1.13.11">
<artifact name="mockk-agent-android-1.13.11.aar">
<sha256 value="2bdf9f489ba3d2ed6d4e71e7a3dee485484319c8c9250b8a9d5e068c0394fcf3" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-agent-android-1.13.10.module">
<sha256 value="5ac2fe2b7a3e4e145fbc6d2039a7cf3cc27321e899e08b0be051cf180b0ecce6" origin="Generated by Gradle"/>
<artifact name="mockk-agent-android-1.13.11.module">
<sha256 value="770fc0f53f01365e7a093ad291950c413922d1c797f680a596d6333f3f6d86fb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-agent-api" version="1.13.10">
<artifact name="mockk-agent-api-1.13.10.module">
<sha256 value="3faaf353a84eb76f70ff2a7c0b79891fd9e71ea91ae48d78c8efc868385a9b43" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-agent-api" version="1.13.11">
<artifact name="mockk-agent-api-1.13.11.module">
<sha256 value="e69e2e0a3a4269472ef16ad7d5ad2c96cd5e4c20702a5293e5fee3494a14cb53" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-agent-api-metadata-1.13.10.jar">
<artifact name="mockk-agent-api-metadata-1.13.11.jar">
<sha256 value="19895b13bd40d94c56b453fa03865203a8077398718e118b4c2dec54457fff5e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-agent-api-jvm" version="1.13.10">
<artifact name="mockk-agent-api-jvm-1.13.10.jar">
<component group="io.mockk" name="mockk-agent-api-jvm" version="1.13.11">
<artifact name="mockk-agent-api-jvm-1.13.11.jar">
<sha256 value="24112974f7afbacc89ce8eff7bb1edb7805b425377450a929456176505b7269c" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-agent-api-jvm-1.13.10.module">
<sha256 value="e94e37af098574f2ee515dc058de37a871a15a50d54cff5db119c7db698635c9" origin="Generated by Gradle"/>
<artifact name="mockk-agent-api-jvm-1.13.11.module">
<sha256 value="eea73d333a7588b04a9f3c4ea53fc931af64c1aabdb00c046d9287910b3514cf" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-agent-jvm" version="1.13.10">
<artifact name="mockk-agent-jvm-1.13.10.jar">
<component group="io.mockk" name="mockk-agent-jvm" version="1.13.11">
<artifact name="mockk-agent-jvm-1.13.11.jar">
<sha256 value="efaded148906eb6e967a611d203e321e968b878794038ef7d14648bf0f99de4e" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-agent-jvm-1.13.10.module">
<sha256 value="b808e5682430bbf865609d44de1daea48b06512b53fd1ca4d007707f693e594a" origin="Generated by Gradle"/>
<artifact name="mockk-agent-jvm-1.13.11.module">
<sha256 value="b747fb8b36ba73d2542323299156bae25d4b3f12fc92c4760895660c93455911" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-android" version="1.13.10">
<artifact name="mockk-android-1.13.10.aar">
<component group="io.mockk" name="mockk-android" version="1.13.11">
<artifact name="mockk-android-1.13.11.aar">
<sha256 value="1cb0955c9d49f1e72f0728dcfb79ca8a951056470253f30850cbd0fc634771ce" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-android-1.13.10.module">
<sha256 value="9fcd7dabfada7ff8a3f31a78503360920b8b39d35b10930f812b31830810ce34" origin="Generated by Gradle"/>
<artifact name="mockk-android-1.13.11.module">
<sha256 value="a9e7d6b0ea6ac5408955df735ee30dd9ae3a82c7b2a88d7e98f8f0239d9283d7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-core" version="1.13.10">
<artifact name="mockk-core-1.13.10.module">
<sha256 value="850bb3854cffd5685b535ae0fb28e8fbbb614a9f372ce5a03100d9afebd0f78d" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-core" version="1.13.11">
<artifact name="mockk-core-1.13.11.module">
<sha256 value="107d74fa03405de7471ddf600605419d4fe9867d31fc2f54fe368a969a5d1527" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-core-metadata-1.13.10.jar">
<artifact name="mockk-core-metadata-1.13.11.jar">
<sha256 value="19895b13bd40d94c56b453fa03865203a8077398718e118b4c2dec54457fff5e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-core-jvm" version="1.13.10">
<artifact name="mockk-core-jvm-1.13.10.jar">
<sha256 value="757fd135c77902377caf1a9cee0f22809c87f267c72de4c21a3e463f75b72c6b" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-core-jvm" version="1.13.11">
<artifact name="mockk-core-jvm-1.13.11.jar">
<sha256 value="106ffbd4417a6851209c736c3a93de87dd17340ce75a77ce041b8e64b64a9aff" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-core-jvm-1.13.10.module">
<sha256 value="be683e0f874e3f81b90916f4c4666349c6ea94c1a2ef9abd22df6be74d60f8f1" origin="Generated by Gradle"/>
<artifact name="mockk-core-jvm-1.13.11.module">
<sha256 value="fbf61a99aaa64f8b248be99659fa923b6d6fd3ff51d8ca50bd0ac89ba0e3e42e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-dsl" version="1.13.10">
<artifact name="mockk-dsl-1.13.10.module">
<sha256 value="c18af249053fa205348fc83558dde40402fdaac3b4e63d17761502c1371dda85" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-dsl" version="1.13.11">
<artifact name="mockk-dsl-1.13.11.module">
<sha256 value="aa5b08a5f3c5665788dab5608bb1d90d1124721dab98196f8c97f6b9f58199b4" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-dsl-metadata-1.13.10.jar">
<artifact name="mockk-dsl-metadata-1.13.11.jar">
<sha256 value="19895b13bd40d94c56b453fa03865203a8077398718e118b4c2dec54457fff5e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-dsl-jvm" version="1.13.10">
<artifact name="mockk-dsl-jvm-1.13.10.jar">
<sha256 value="06886fdb319ec94d63b49403dde68c1d58b6675e91730dbc5a852d3abb45efd7" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-dsl-jvm" version="1.13.11">
<artifact name="mockk-dsl-jvm-1.13.11.jar">
<sha256 value="d1a13dbe7aefc9fbcc9e62c968aaa1c6c2f13bd15fc880d23d6f872c6359661f" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-dsl-jvm-1.13.10.module">
<sha256 value="cb2ed5564c258dbe30c493c7a3489f045da61d70f5a84d44aed6b6e2cdae5847" origin="Generated by Gradle"/>
<artifact name="mockk-dsl-jvm-1.13.11.module">
<sha256 value="e6924ad727c1a8b720951b2ce6490b72badf985f7cbfc663ce81e8e4ebf71152" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.mockk" name="mockk-jvm" version="1.13.10">
<artifact name="mockk-jvm-1.13.10.jar">
<sha256 value="1af9f040dcbb2d5c15ce6260547630001e066f5977711b7e2bce4b0e78d01a61" origin="Generated by Gradle"/>
<component group="io.mockk" name="mockk-jvm" version="1.13.11">
<artifact name="mockk-jvm-1.13.11.jar">
<sha256 value="31535572c69ad432c7b36783683e7c37947b06def45e49a826122ffcc602a13a" origin="Generated by Gradle"/>
</artifact>
<artifact name="mockk-jvm-1.13.10.module">
<sha256 value="1e286bcde441a223ef5386fe4a56e86cd09b1d34974589a828aee52493571af3" origin="Generated by Gradle"/>
<artifact name="mockk-jvm-1.13.11.module">
<sha256 value="71e8cc05e9dc8b228a710eff7a9a3c48dcab1ed103fb2994ca911faf425e4043" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.netty" name="netty-buffer" version="4.1.93.Final">
Expand Down
Loading