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

Update Kotlin version; remove support for 1.7 #803

Merged
merged 4 commits into from
Jun 8, 2024
+12 −4
Merged

Update Kotlin version; remove support for 1.7 #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38cf74a
Update Kotlin version
k163377 Jun 8, 2024
915a15f
Fix WF
k163377 Jun 8, 2024
b84a55d
Fix readme
k163377 Jun 8, 2024
f9d4788
Update release notes wrt #803
k163377 Jun 8, 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
4 changes: 3 additions & 1 deletion .github/workflows/dep_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ jobs:
matrix:
java_version: ['8', '17', '21']
# Versions need to align with ones in 'main.yml' workflow
kotlin_version: ['1.7.22', '1.8.10', '1.9.23', '2.0.0-Beta4']
Copy link
Member

Choose a reason for hiding this comment

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

Is there an issue/PR to link to, wrt dropping support for Kotlin 1.7?

I'll make a minor note on https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.18 but could use a link from there.

Copy link
Member

Choose a reason for hiding this comment

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

Specifically, this PR is for changing the default Kotlin version; I can link to this one but if so should explain the reason for dropping in description, if so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is because Kotlin 2.0 has been released.
The description has also been modified.

Copy link
Member

@cowtowncoder cowtowncoder Jun 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ok but neither title nor description mentions dropping 1.7 -- I can modify title.

The point is to make it visible to everybody who happens to see this PR, or link to it.
To give bit of context.

Thanks!

# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
# https://youtrack.jetbrains.com/issue/KT-65156
kotlin_version: ['1.8.10', '1.9.23', '2.0.0-Beta4']
Copy link
Member

Choose a reason for hiding this comment

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

Presumably 2.0.0-Beta4 could become 2.0.0 (or 2.0.0-Final or whatever it is?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It has been corrected by another PR.
https://github.com/FasterXML/jackson-module-kotlin/tree/2.18/.github/workflows

os: ['ubuntu-22.04']
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ jobs:
matrix:
java_version: ['8', '11', '17', '21', '22']
# kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10.
# https://youtrack.jetbrains.com/issue/KT-65156
# kotlin-reflect 2.0.0-Beta5 is not used because of KT-67209
kotlin_version: ['1.7.22', '1.8.10', '1.9.23', '2.0.0-Beta4']
kotlin_version: ['1.8.10', '1.9.23', '2.0.0-Beta4']
include:
- java_version: '8'
kotlin_version: '1.7.22'
kotlin_version: '1.8.10'
release_build: 'R'
env:
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ println(arrayNode.toString()) // ["foo",true,1,1.0,"YmFy"]
Different `kotlin-core` versions are supported by different Jackson Kotlin module minor versions.
Here is an incomplete list of supported versions:

* Jackson 2.18.x: Kotlin-core 1.8 - 2.0
* Jackson 2.17.x: Kotlin-core 1.7 - 2.0
* Jackson 2.16.x: Kotlin-core 1.6 - 1.9
* Jackson 2.15.x: Kotlin-core 1.5 - 1.8
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@
<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>

<version.kotlin>1.7.22</version.kotlin>
<!-- kotlin-reflect 1.8.2x has a bug and some tests fail, so we are downgrading to 1.8.10. -->
<!-- https://youtrack.jetbrains.com/issue/KT-65156 -->
<version.kotlin>1.8.10</version.kotlin>

<!-- Generate PackageVersion.java into this directory. -->
<packageVersion.dir>com/fasterxml/jackson/module/kotlin</packageVersion.dir>
Expand Down
2 changes: 2 additions & 0 deletions release-notes/VERSION-2.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Co-maintainers:

2.18.0 (not yet released)

#803: Kotlin has been upgraded to 1.8.10.
The reason 1.8.22 is not used is to avoid KT-65156.
#782: Content marked as deprecated has been reorganized.
Several constructors and accessors to properties of KotlinModule.Builder that were marked as DeprecationLevel.ERROR have been removed.
Also, the content marked as DeprecationLevel.WARNING is now DeprecationLevel.ERROR.
Expand Down