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

Jump to bottom

Dependency updates 20230628 #14046

Merged
merged 6 commits into from
Jun 28, 2023
Merged

Dependency updates 20230628 #14046

merged 6 commits into from
Jun 28, 2023

Conversation

mikehardy
Copy link
Member

Pull Request template

Purpose / Description

Non-trivial dependency updates - important changes:

  • JDK11 is dropped, minimum supported JDK for AnkiDroid is now JDK17
  • compilation source/target JVM level is bumped from 8 to 11

These are required to keep up with transitive dependencies and I would like to get them in before we branch 2.16 off for release / support fixes, as straddling the JDK toolchain version is painful

Approach

Carefully work through dependency update PRs, they all have related commits with explanations

How Has This Been Tested?

Carefully test on API21 emulator while checking that JVM11 source/target and JDK17-compiled artifacts work correctly. They all seem to work

Learning (optional, can help others)

I rarely learn much from dependency updates, except that staying up to date takes effort

Checklist

Please, go through these checks before submitting the PR.

  • You have a descriptive commit message with a short title (first line, max 50 chars).
  • You have commented your code, particularly in hard-to-understand areas
  • You have performed a self-review of your own code
  • UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
  • UI Changes: You have tested your change using the Google Accessibility Scanner

dependabot bot and others added 6 commits June 28, 2023 08:00
@dependabot @mikehardy
Bump org.jlleitschuh.gradle:ktlint-gradle from 11.4.1 to 11.4.2
bbcf349 
Bumps org.jlleitschuh.gradle:ktlint-gradle from 11.4.1 to 11.4.2.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle:ktlint-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@mikehardy
build(deps): require JDK17 for the build, use JDK17 in workflows
67d6dcd 
17+ is a requirement for new AndroidX library versions, fragment library
lint rules in particular are already failing our lint workflow because
they no longer operate on JDK11
@dependabot @mikehardy
Bump lint_version from 30.4.2 to 31.0.2
01471fa 
Bumps `lint_version` from 30.4.2 to 31.0.2.

Updates `com.android.tools.lint:lint-api` from 30.4.2 to 31.0.2

Updates `com.android.tools.lint:lint` from 30.4.2 to 31.0.2

Updates `com.android.tools.lint:lint-tests` from 30.4.2 to 31.0.2

---
updated-dependencies:
- dependency-name: com.android.tools.lint:lint-api
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.android.tools.lint:lint
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.android.tools.lint:lint-tests
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@mikehardy
build: bump JDK source/target compat to JDK11
48fbdc1 
This is needed for new versions of deps, it passes
jacocoAndroidTestReport target against an API21 emulator (current
minSdkVersion) so seems to be compatible with all required things
@dependabot @mikehardy
Bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.0.0
02349a7 
Bumps [org.mockito.kotlin:mockito-kotlin](https://github.com/mockito/mockito-kotlin) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/mockito/mockito-kotlin/releases)
- [Commits](mockito/mockito-kotlin@4.1.0...5.0.0)

---
updated-dependencies:
- dependency-name: org.mockito.kotlin:mockito-kotlin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@mikehardy
build(deps): have gradle wrapper update PRs go into dependencies
2d8bc84
@mikehardy mikehardy added Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) squash-merge The pull request currently requires maintainers to "Squash Merge" labels Jun 28, 2023
@mikehardy mikehardy merged commit e2bec74 into main Jun 28, 2023
@github-actions github-actions bot added this to the 2.16 release milestone Jun 28, 2023
@github-actions github-actions bot removed Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) squash-merge The pull request currently requires maintainers to "Squash Merge" labels Jun 28, 2023
dae pushed a commit to ankitects/Anki-Android that referenced this pull request Jun 29, 2023
@mikehardy @dependabot @dae
Dependency updates 20230628 (ankidroid#14046)
a667ce5 
* Bump org.jlleitschuh.gradle:ktlint-gradle from 11.4.1 to 11.4.2

Bumps org.jlleitschuh.gradle:ktlint-gradle from 11.4.1 to 11.4.2.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle:ktlint-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps): require JDK17 for the build, use JDK17 in workflows

17+ is a requirement for new AndroidX library versions, fragment library
lint rules in particular are already failing our lint workflow because
they no longer operate on JDK11

* Bump lint_version from 30.4.2 to 31.0.2

Bumps `lint_version` from 30.4.2 to 31.0.2.

Updates `com.android.tools.lint:lint-api` from 30.4.2 to 31.0.2

Updates `com.android.tools.lint:lint` from 30.4.2 to 31.0.2

Updates `com.android.tools.lint:lint-tests` from 30.4.2 to 31.0.2

---
updated-dependencies:
- dependency-name: com.android.tools.lint:lint-api
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.android.tools.lint:lint
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.android.tools.lint:lint-tests
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* build: bump JDK source/target compat to JDK11

This is needed for new versions of deps, it passes
jacocoAndroidTestReport target against an API21 emulator (current
minSdkVersion) so seems to be compatible with all required things

* Bump org.mockito.kotlin:mockito-kotlin from 4.1.0 to 5.0.0

Bumps [org.mockito.kotlin:mockito-kotlin](https://github.com/mockito/mockito-kotlin) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/mockito/mockito-kotlin/releases)
- [Commits](mockito/mockito-kotlin@4.1.0...5.0.0)

---
updated-dependencies:
- dependency-name: org.mockito.kotlin:mockito-kotlin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* build(deps): have gradle wrapper update PRs go into dependencies

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@david-allison david-allison mentioned this pull request Aug 15, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.16 release
Development

Successfully merging this pull request may close these issues.
1 participant
@mikehardy