Dependency updates, JDK17 v2 #863
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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
force-pushed
the
feature/dependency-updates-v2
branch
from
03d331e
to
9df93d5
Compare
aSemy
commented
Jul 26, 2022
Comment on lines
+76
to
+93
| - 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." |
There was a problem hiding this comment.
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?
aSemy
commented
Jul 26, 2022
Comment on lines
5
to
14
| - tools | ||
| - platform-tools | ||
| - build-tools-27.0.3 | ||
| - android-28 | ||
| - android-30 | ||
|
|
||
| jdk: | ||
| - oraclejdk8 | ||
| - openjdk17 | ||
|
|
||
| install: | ||
| - yes | sdkmanager "ndk;20.0.5594570" |
There was a problem hiding this comment.
Is Travis used? Or can this config file be removed?
aSemy
commented
Jul 26, 2022
Comment on lines
3
to
9
| build: | ||
| working_directory: ~/code | ||
| docker: | ||
| - image: circleci/android:api-26-alpha | ||
| - image: circleci/android:api-30 | ||
| resource_class: xlarge | ||
| environment: | ||
| JVM_OPTS: -Xmx4096m |
There was a problem hiding this comment.
Is Circle CI used? Or can this config file be removed?
aSemy
commented
Jul 26, 2022
| @@ -52,7 +51,8 @@ jobs: | |||
| runs-on: macos-latest | |||
| strategy: | |||
| matrix: | |||
| api-level: [ 28, 29 ] | |||
| api-level: [ 26, 28, 29 ] | |||
There was a problem hiding this comment.
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
kodiakhq bot
pushed a commit
to RBusarow/Dispatch
that referenced
this pull request
Aug 23, 2022
[](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` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](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 [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#886 - only sign if the signing properties are present by [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#885 - Fix an issue that Android libraries was not published by [@​kubode](https://togithub.com/kubode) in [mockk/mockk#887 #### New Contributors - [@​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 [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#863 - Dependency updates, JDK17 by [@​hduerkop](https://togithub.com/hduerkop) in [mockk/mockk#829 - Fix unmockkAll to work if constructor was mocked multiple times by [@​Chrostoq](https://togithub.com/Chrostoq) in [mockk/mockk#870 - fix: fix value class field determination by [@​qoomon](https://togithub.com/qoomon) in [mockk/mockk#872 - [#​854](https://togithub.com/mockk/mockk/issues/854) update projects to use new Kotlin Multiplatform Gradle plugin by [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#855 #### New Contributors - [@​hduerkop](https://togithub.com/hduerkop) made their first contribution in [mockk/mockk#829 - [@​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
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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!