Skip to content

Commit

Permalink
Merge pull request #12 from mauritssilvis/support_java_21
Browse files Browse the repository at this point in the history
Fully support Java 21
  • Loading branch information
mauritssilvis authored Dec 1, 2023
2 parents 5f37ef5 + caeda66 commit a2e9c15
Show file tree
Hide file tree
Showing 6 changed files with 145 additions and 7 deletions.
90 changes: 87 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,88 @@
# https://help.github.com/articles/dealing-with-line-endings/
* text eol=lf
# Created by https://gitattributes.io/api/common
# Adapted according to https://stackoverflow.com/a/42135910/12911324

*.bat text eol=crlf
# Common settings that generally should always be used with your language specific settings

# Auto detect text files and perform LF normalization
* text=auto eol=lf

#
# The above will handle all files NOT found below
#

# Documents
*.bibtex text diff=bibtex
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.md text diff=markdown
*.mdx text diff=markdown
*.tex text diff=tex
*.adoc text
*.textile text
*.mustache text
*.csv text eol=crlf
*.tab text
*.tsv text
*.txt text
*.sql text
*.epub diff=astextplain

# Graphics
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.tif binary
*.tiff binary
*.ico binary
# SVG treated as text by default.
*.svg text
# If you want to treat it as binary,
# use the following line instead.
# *.svg binary
*.eps binary

# Scripts
*.bash text eol=lf
*.fish text eol=lf
*.sh text eol=lf
*.zsh text eol=lf
# These are explicitly windows files and should use crlf
*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf

# Serialisation
*.json text
*.toml text
*.xml text
*.yaml text
*.yml text

# Archives
*.7z binary
*.gz binary
*.tar binary
*.tgz binary
*.zip binary

# Text files where line endings should be preserved
*.patch -text

#
# Exclude files from exporting
#

.gitattributes export-ignore
.gitignore export-ignore
.gitkeep export-ignore

# End of https://gitattributes.io/api/common
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to the [Types](https://github.com/mauritssilvis/types) proje
The file format is based on [keep a changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0.html).

## [0.2.1] - 2023-12-01

### Changed

- Update the Gradle version from 8.4 to 8.5.
- Update the JUnit version from 5.10.0 to 5.10.1.

## [0.2.0] - 2023-10-11

### Changed
Expand All @@ -19,3 +26,9 @@ and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0
### Added

- Add a Java immutable string data type implementation.

## License

Copyright © 2023 Maurits Silvis

This source code package is subject to the terms and conditions defined in the [GNU General Public License v3.0](LICENSE.md) or later.
42 changes: 42 additions & 0 deletions java/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Created by https://gitattributes.io/api/java

# Java sources
*.java text diff=java
*.kt text diff=kotlin
*.groovy text diff=java
*.scala text diff=java
*.gradle text diff=java
*.gradle.kts text diff=kotlin

# These files are text and should be normalized (Convert crlf => lf)
*.css text diff=css
*.scss text diff=css
*.sass text
*.df text
*.htm text diff=html
*.html text diff=html
*.js text
*.jsp text
*.jspf text
*.jspx text
*.properties text
*.tld text
*.tag text
*.tagx text
*.xml text

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.class binary
*.dll binary
*.ear binary
*.jar binary
*.so binary
*.war binary
*.jks binary

# Common build-tool wrapper scripts ('.cmd' versions are handled by 'Common.gitattributes')
mvnw text eol=lf
gradlew text eol=lf

# End of https://gitattributes.io/api/java
4 changes: 2 additions & 2 deletions java/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

java-jdk = "21"

java-types = "0.2.0"
java-types = "0.2.1"

junit-jupiter = "5.10.0"
junit-jupiter = "5.10.1"

[libraries]

Expand Down
Binary file modified java/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions java/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
# TODO: Select a Gradle version that officially supports running on Java 21
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit a2e9c15

Please sign in to comment.