Skip to content

Commit

Permalink
Merge pull request #12 from skalarproduktraum/bump-kotlin-and-scijava…
Browse files Browse the repository at this point in the history
…-pom-37

Bump Kotlin and scijava POM
  • Loading branch information
ctrueden committed Apr 19, 2024
2 parents d1dd7c1 + fa8cde1 commit 83351db
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-main.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '11'
distribution: 'zulu'
cache: 'maven'
- name: Set up CI environment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '11'
distribution: 'zulu'
cache: 'maven'
- name: Set up CI environment
Expand Down
6 changes: 4 additions & 2 deletions pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>36.0.0</version>
<version>37.0.0</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -94,7 +94,9 @@ Wisconsin-Madison.</license.copyrightOwners>

<kotlin-compiler-embeddable.optional>false</kotlin-compiler-embeddable.optional>
<!-- NB: kotlin requires 1.X for versions up to 8. This can be removed when scijava.jvm.version goes to 9 -->
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>

<kotlin.version>1.9.23</kotlin.version>
</properties>

<repositories>
Expand Down

0 comments on commit 83351db

Please sign in to comment.