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.

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

Dependency updates, JDK17 v2 #863

Merged
merged 43 commits into from Jul 27, 2022
Merged

Conversation

aSemy
Copy link
Contributor

@aSemy aSemy commented Jul 26, 2022

I updated this PR #829 to include the latest changes from master. I think the Android changes are important.

@hduerkop thanks for the initial PR!

Hendrik Duerkop and others added 24 commits May 24, 2022
…pdates-v2

# Conflicts:
#	.github/workflows/gradle.yml
#	build.gradle
#	gradle.properties
#	mockk/common/src/main/kotlin/io/mockk/impl/recording/PermanentMocker.kt
#	mockk/common/src/main/kotlin/io/mockk/impl/recording/states/StubbingAwaitingAnswerState.kt
#	mockk/common/src/main/kotlin/io/mockk/impl/recording/states/VerifyingState.kt
#	mockk/common/src/test/kotlin/io/mockk/it/ValueClassTest.kt
#	plugins/dependencies/src/main/kotlin/io/mockk/dependencies/Deps.kt
@aSemy aSemy force-pushed the feature/dependency-updates-v2 branch from 03d331e to 9df93d5 Compare Jul 26, 2022
@aSemy aSemy marked this pull request as draft Jul 26, 2022
- name: AVD cache
uses: actions/cache@v3
id: avd-cache
with:
path: |
~/.android/avd/*
~/.android/adb*
key: ${{ runner.os }}-avd-${{ matrix.api-level }}

- name: create AVD and generate snapshot for caching
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: ${{ matrix.api-level }}
force-avd-creation: false
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
disable-animations: false
script: echo "Generated AVD snapshot for caching."
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copied from here: https://github.com/ReactiveCircus/android-emulator-runner

I don't know if creating an AVD and caching it is necessary though? Do the tests need an AVD?

- tools
- platform-tools
- build-tools-27.0.3
- android-28
- android-30

jdk:
- oraclejdk8
- openjdk17

install:
- yes | sdkmanager "ndk;20.0.5594570"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is Travis used? Or can this config file be removed?

build:
working_directory: ~/code
docker:
- image: circleci/android:api-26-alpha
- image: circleci/android:api-30
resource_class: xlarge
environment:
JVM_OPTS: -Xmx4096m
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is Circle CI used? Or can this config file be removed?

@@ -52,7 +51,8 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
api-level: [ 28, 29 ]
api-level: [ 26, 28, 29 ]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what the best combo here is... 🤷‍♀️

I added 26 because that's the minimum set in the Gradle files. Maybe 28 can be removed?

The max level set in Gradle is 32, but when I set it, it failed - something about the combo not being available? ReactiveCircus/android-emulator-runner#234

Apparently 30+ is slow ReactiveCircus/android-emulator-runner#222

@aSemy aSemy marked this pull request as ready for review Jul 26, 2022
@Raibaz Raibaz merged commit c50d242 into mockk:master Jul 27, 2022
21 checks passed
@aSemy aSemy deleted the feature/dependency-updates-v2 branch Aug 12, 2022
kodiakhq bot pushed a commit to RBusarow/Dispatch that referenced this pull request Aug 23, 2022
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [io.mockk:mockk](https://mockk.io) ([source](https://togithub.com/mockk/mockk)) | `1.12.5` -> `1.12.7` | [![age](https://badges.renovateapi.com/packages/maven/io.mockk:mockk/1.12.7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/io.mockk:mockk/1.12.7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/io.mockk:mockk/1.12.7/compatibility-slim/1.12.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/io.mockk:mockk/1.12.7/confidence-slim/1.12.5)](https://docs.renovatebot.com/merge-confidence/) |

---

### Release Notes

<details>
<summary>mockk/mockk</summary>

### [`v1.12.7`](https://togithub.com/mockk/mockk/releases/tag/1.12.7)

[Compare Source](https://togithub.com/mockk/mockk/compare/1.12.6...1.12.7)

#### What's Changed

-   Update android-sdk-detector.settings.gradle.kts by [@&#8203;aSemy](https://togithub.com/aSemy) in [mockk/mockk#886
-   only sign if the signing properties are present by [@&#8203;aSemy](https://togithub.com/aSemy) in [mockk/mockk#885
-   Fix an issue that Android libraries was not published by [@&#8203;kubode](https://togithub.com/kubode) in [mockk/mockk#887

#### New Contributors

-   [@&#8203;kubode](https://togithub.com/kubode) made their first contribution in [mockk/mockk#887

**Full Changelog**: mockk/mockk@1.12.6...1.12.7

### [`v1.12.6`](https://togithub.com/mockk/mockk/releases/tag/1.12.6)

[Compare Source](https://togithub.com/mockk/mockk/compare/1.12.5...1.12.6)

#### What's Changed

-   Dependency updates, JDK17 v2 by [@&#8203;aSemy](https://togithub.com/aSemy) in [mockk/mockk#863
-   Dependency updates, JDK17 by [@&#8203;hduerkop](https://togithub.com/hduerkop) in [mockk/mockk#829
-   Fix unmockkAll to work if constructor was mocked multiple times by [@&#8203;Chrostoq](https://togithub.com/Chrostoq) in [mockk/mockk#870
-   fix: fix value class field determination by [@&#8203;qoomon](https://togithub.com/qoomon) in [mockk/mockk#872
-   [#&#8203;854](https://togithub.com/mockk/mockk/issues/854) update projects to use new Kotlin Multiplatform Gradle plugin by [@&#8203;aSemy](https://togithub.com/aSemy) in [mockk/mockk#855

#### New Contributors

-   [@&#8203;hduerkop](https://togithub.com/hduerkop) made their first contribution in [mockk/mockk#829
-   [@&#8203;Chrostoq](https://togithub.com/Chrostoq) made their first contribution in [mockk/mockk#870

**Full Changelog**: mockk/mockk@1.12.5...1.12.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

 **Rebasing**: Never, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/RBusarow/Dispatch).



PR-URL: #564
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants