Skip to content

Commit

Permalink
base Java 17, switch to 17+dev-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
AlmasB committed Dec 12, 2021
1 parent 2ea725d commit e1acdec
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy_SNAPSHOT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@ jobs:
build:

runs-on: ubuntu-latest
env:
MAVEN_OPTS: --illegal-access=permit

steps:
- uses: actions/checkout@v2

- name: Set up latest stable JDK
uses: actions/setup-java@v1
with:
java-version: 16
java-version: 17

- name: Cache maven deps
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion fxgl-controllerinput/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-entity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-gameplay/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-scene/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl-zdeploy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion fxgl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>fxgl-framework</artifactId>
<groupId>com.github.almasb</groupId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>
</parent>

<artifactId>fxgl</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.github.almasb</groupId>
<artifactId>fxgl-framework</artifactId>
<version>11+dev-SNAPSHOT</version>
<version>17+dev-SNAPSHOT</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -63,14 +63,14 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<source.version>11</source.version>
<source.version>17</source.version>
<fxgl.version>${project.version}</fxgl.version>

<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>dd.MM.yyyy HH.mm</maven.build.timestamp.format>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>

Expand Down

0 comments on commit e1acdec

Please sign in to comment.