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

update Kotlin and Java Toolchain properties, and setting them in CI #1056

Merged
merged 5 commits into from
Sep 19, 2023

Conversation

aSemy
Copy link
Contributor

@aSemy aSemy commented Feb 19, 2023

Fix #1048

  • prefix the Java and Kotlin versions with io_mockk, which can help in some situations (e.g. if an individual wants to set them specifically on their machine they can add them in $GRADLE_USER_HOME/gradle.properties and not risk clashing with other properties)
  • standardise the naming for the Kotlin and Java versions (I chose snake_case, but camelCase would work as well - up to you)
  • remove Java version/target/toolchain from buildSrc/build.gradle.kts - it should be inherited from the root project

@Raibaz
Copy link
Collaborator

Raibaz commented Sep 14, 2023

Is this still needed? @aSemy if so, can you please resolve the conflicts?

@aSemy aSemy force-pushed the fix/configurable_kotlin_version branch from fa7f7e6 to dc7968b Compare September 19, 2023 12:26
@aSemy
Copy link
Contributor Author

aSemy commented Sep 19, 2023

hey @Raibaz, it's been a while since I looked at this, so I think this PR is now just a bit of tidying.

  • prefix the Java and Kotlin versions with io_mockk, which can help in some situations (e.g. if an individual wants to set them specifically on their machine they can add them in $GRADLE_USER_HOME/gradle.properties and not risk clashing with other properties)
  • standardise the naming for the Kotlin and Java versions (I chose snake_case, but camelCase would work as well - up to you)
  • remove Java version/target/toolchain from buildSrc/build.gradle.kts - it should be inherited from the root project

@aSemy aSemy force-pushed the fix/configurable_kotlin_version branch from 44b4ac8 to 8479d34 Compare September 19, 2023 12:45
@Raibaz Raibaz merged commit 3261aff into mockk:master Sep 19, 2023
11 checks passed
@aSemy aSemy deleted the fix/configurable_kotlin_version branch September 19, 2023 14:23
renovate bot referenced this pull request in kotest/kotest Feb 5, 2024
[![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.13.7` -> `1.13.9` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/io.mockk:mockk/1.13.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/io.mockk:mockk/1.13.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/io.mockk:mockk/1.13.7/1.13.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/io.mockk:mockk/1.13.7/1.13.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>mockk/mockk (io.mockk:mockk)</summary>

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

[Compare
Source](https://togithub.com/mockk/mockk/compare/1.13.8...1.13.9)

#### What's Changed

- Remove AllOpen plugin from Android libraries by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1164](https://togithub.com/mockk/mockk/pull/1164)
- Enforce reproducible builds by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1162](https://togithub.com/mockk/mockk/pull/1162)
- Fix unit tests errors by using `slf4jOrJulLogging()` by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1166](https://togithub.com/mockk/mockk/pull/1166)
- Remove KAPT from Android libraries by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1163](https://togithub.com/mockk/mockk/pull/1163)
- JVM 1.8 source compatibility by
[@&#8203;jeffdgr8](https://togithub.com/jeffdgr8) in
[https://github.com/mockk/mockk/pull/1161](https://togithub.com/mockk/mockk/pull/1161)
- Specify unique `android.namespace` to resolve warnings by
[@&#8203;kubode](https://togithub.com/kubode) in
[https://github.com/mockk/mockk/pull/1181](https://togithub.com/mockk/mockk/pull/1181)
- Add scoped mock documentation by
[@&#8203;kshired](https://togithub.com/kshired) in
[https://github.com/mockk/mockk/pull/1175](https://togithub.com/mockk/mockk/pull/1175)
- Upgrade Gradle to 8.4 by
[@&#8203;geekiyer](https://togithub.com/geekiyer) in
[https://github.com/mockk/mockk/pull/1184](https://togithub.com/mockk/mockk/pull/1184)
- Fixes infinite recursion when stubbing a fun that returns value class
by [@&#8203;OitoH](https://togithub.com/OitoH) in
[https://github.com/mockk/mockk/pull/1176](https://togithub.com/mockk/mockk/pull/1176)
- Prevent kover setup failure without Android SDK by
[@&#8203;milgner](https://togithub.com/milgner) in
[https://github.com/mockk/mockk/pull/1193](https://togithub.com/mockk/mockk/pull/1193)
- Support value classes for non-primitive types by
[@&#8203;milgner](https://togithub.com/milgner) in
[https://github.com/mockk/mockk/pull/1192](https://togithub.com/mockk/mockk/pull/1192)
- Fix StackOverflowError calling method on spy of class with generic
base class by [@&#8203;flapenna](https://togithub.com/flapenna) in
[https://github.com/mockk/mockk/pull/1195](https://togithub.com/mockk/mockk/pull/1195)

#### New Contributors

- [@&#8203;jeffdgr8](https://togithub.com/jeffdgr8) made their first
contribution in
[https://github.com/mockk/mockk/pull/1161](https://togithub.com/mockk/mockk/pull/1161)
- [@&#8203;kshired](https://togithub.com/kshired) made their first
contribution in
[https://github.com/mockk/mockk/pull/1175](https://togithub.com/mockk/mockk/pull/1175)
- [@&#8203;OitoH](https://togithub.com/OitoH) made their first
contribution in
[https://github.com/mockk/mockk/pull/1176](https://togithub.com/mockk/mockk/pull/1176)
- [@&#8203;flapenna](https://togithub.com/flapenna) made their first
contribution in
[https://github.com/mockk/mockk/pull/1195](https://togithub.com/mockk/mockk/pull/1195)

**Full Changelog**:
mockk/mockk@1.13.8...1.13.9

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

[Compare
Source](https://togithub.com/mockk/mockk/compare/1.13.7...1.13.8)

#### What's Changed

- Bump googleapis from 20.2.0 to 59.0.0 in /cloud-badge by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/mockk/mockk/pull/482](https://togithub.com/mockk/mockk/pull/482)
- Minor performance improvements to MockInjector by
[@&#8203;k163377](https://togithub.com/k163377) in
[https://github.com/mockk/mockk/pull/1134](https://togithub.com/mockk/mockk/pull/1134)
- Improve log message by
[@&#8203;marcelstoer](https://togithub.com/marcelstoer) in
[https://github.com/mockk/mockk/pull/1117](https://togithub.com/mockk/mockk/pull/1117)
- Update README.md by [@&#8203;iainism](https://togithub.com/iainism) in
[https://github.com/mockk/mockk/pull/1140](https://togithub.com/mockk/mockk/pull/1140)
- Update Android test targets by
[@&#8203;LeonRa](https://togithub.com/LeonRa) in
[https://github.com/mockk/mockk/pull/1146](https://togithub.com/mockk/mockk/pull/1146)
- Fix `IncompatibleClassChangeError` in Android instrumentation test
([#&#8203;1035](https://togithub.com/mockk/mockk/issues/1035)) by
[@&#8203;LeonRa](https://togithub.com/LeonRa) in
[https://github.com/mockk/mockk/pull/1145](https://togithub.com/mockk/mockk/pull/1145)
- Update Gradle and Android dependencies by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1105](https://togithub.com/mockk/mockk/pull/1105)
- Update byte-buddy 1.14.6 by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1149](https://togithub.com/mockk/mockk/pull/1149)
- Remove unused `androidTools` in `Deps.kt` by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1150](https://togithub.com/mockk/mockk/pull/1150)
- Update Kotlin 1.9.10 by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1148](https://togithub.com/mockk/mockk/pull/1148)
- Update KotlinX Kover 0.7.3 by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1152](https://togithub.com/mockk/mockk/pull/1152)
- Remove Kotlin-IR from CI matrix by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1153](https://togithub.com/mockk/mockk/pull/1153)
- Update Dokka 1.9.0 by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1151](https://togithub.com/mockk/mockk/pull/1151)
- Fix Kotlin version override in tests by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1154](https://togithub.com/mockk/mockk/pull/1154)
- Use new Kotlin logo by [@&#8203;Goooler](https://togithub.com/Goooler)
in
[https://github.com/mockk/mockk/pull/1156](https://togithub.com/mockk/mockk/pull/1156)
- Swap expected/actual in `KotlinVersionOverrideTest.kt` by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1157](https://togithub.com/mockk/mockk/pull/1157)
- Reduce the use of spread operator to improve performance by
[@&#8203;k163377](https://togithub.com/k163377) in
[https://github.com/mockk/mockk/pull/1143](https://togithub.com/mockk/mockk/pull/1143)
- update Kotlin and Java Toolchain properties, and setting them in CI by
[@&#8203;aSemy](https://togithub.com/aSemy) in
[https://github.com/mockk/mockk/pull/1056](https://togithub.com/mockk/mockk/pull/1056)
- Fix `dokkaJavadoc` publishing task by
[@&#8203;SimonMarquis](https://togithub.com/SimonMarquis) in
[https://github.com/mockk/mockk/pull/1160](https://togithub.com/mockk/mockk/pull/1160)

#### New Contributors

- [@&#8203;dependabot](https://togithub.com/dependabot) made their first
contribution in
[https://github.com/mockk/mockk/pull/482](https://togithub.com/mockk/mockk/pull/482)
- [@&#8203;k163377](https://togithub.com/k163377) made their first
contribution in
[https://github.com/mockk/mockk/pull/1134](https://togithub.com/mockk/mockk/pull/1134)
- [@&#8203;marcelstoer](https://togithub.com/marcelstoer) made their
first contribution in
[https://github.com/mockk/mockk/pull/1117](https://togithub.com/mockk/mockk/pull/1117)
- [@&#8203;LeonRa](https://togithub.com/LeonRa) made their first
contribution in
[https://github.com/mockk/mockk/pull/1146](https://togithub.com/mockk/mockk/pull/1146)

**Full Changelog**:
mockk/mockk@1.13.7...1.13.8

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 3am on the first day of the
month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

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

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/kotest/kotest).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNTMuMiIsInVwZGF0ZWRJblZlciI6IjM3LjE1My4yIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

Kotlin version configured from GitHub Actions workflow is not correctly applied
2 participants