Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
StevenLooman committed Feb 29, 2024
1 parent ad3691a commit fd1260c
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 35 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'zulu'
cache: 'maven'
- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -36,7 +36,7 @@ jobs:
- run: mkdir staging && cp **/target/*.jar staging
- run: cd magik-language-server/client-vscode && npm install . && npm run package
- run: cp magik-language-server/client-vscode/magik-language-server-*.vsix staging
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Package-${{ matrix.os }}
path: staging
Expand All @@ -45,6 +45,6 @@ jobs:
name: Markdown Lint
runs-on: ubuntu-latest
steps:
- uses: DavidAnson/markdownlint-cli2-action@v11
- uses: DavidAnson/markdownlint-cli2-action@v15
with:
globs: '**/*.md'
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'zulu'
cache: 'maven'
- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sonar_cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ jobs:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'zulu'
cache: 'maven'
- name: Cache SonarCloud packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Changes

0.9.1 (unreleased)
0.10.0 (unreleased)

- Move to Java 17.
- Add base functionality to apply fixes from magik-lint.

0.9.0 (2024-02-26)
Expand Down
2 changes: 1 addition & 1 deletion magik-checks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>magik-checks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion magik-debug-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>magik-debug-adapter</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions magik-language-server/client-vscode/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion magik-language-server/client-vscode/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Magik Language Server and Debug Adapter client for VSCode",
"author": "Steven Looman",
"license": "GPL-3.0-only",
"version": "0.9.1-SNAPSHOT",
"version": "0.10.0-SNAPSHOT",
"publisher": "StevenLooman",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion magik-language-server/client-vscode/client/src/const.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const MAGIK_TOOLS_VERSION = '0.9.1-SNAPSHOT';
export const MAGIK_TOOLS_VERSION = '0.10.0-SNAPSHOT';
4 changes: 2 additions & 2 deletions magik-language-server/client-vscode/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion magik-language-server/client-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Magik Language Server",
"author": "Steven Looman",
"license": "GPL-3.0-only",
"version": "0.9.1-SNAPSHOT",
"version": "0.10.0-SNAPSHOT",
"repository": {
"type": "git",
"url": "https://github.com/StevenLooman/magik-tools"
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion magik-language-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>magik-language-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion magik-lint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>magik-lint</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion magik-squid/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>magik-squid</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion magik-typed-checks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>magik-typed-checks</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Magik Tools</name>
Expand Down Expand Up @@ -45,8 +45,9 @@

<properties>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

Expand Down
2 changes: 1 addition & 1 deletion sonar-magik-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>sonar-magik-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion sslr-magik-toolkit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>nl.ramsolutions</groupId>
<artifactId>magik-tools</artifactId>
<version>0.9.1-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>
</parent>

<artifactId>sslr-magik-toolkit</artifactId>
Expand Down

0 comments on commit fd1260c

Please sign in to comment.