Merge branch 'master' into fix_generatesMetadataFilesAtProjectRoot

Author: jcs090218

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/docs.yml

@@ -10,15 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - uses: purcell/setup-emacs@master
-        with:
-          version: 27.1
-
-      - uses: conao3/setup-cask@master
-        with:
-          version: 0.8.4
+        uses: actions/checkout@v5
 
       - name: MkDocs
         run: |
@@ -27,7 +19,7 @@ jobs:
           docker run --rm -v ${PWD}:/docs docker.pkg.github.com/emacs-lsp/docs-image/docs-image -- build
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./site

.github/workflows/test.yml

@@ -7,6 +7,11 @@ on:
   pull_request:
     branches:
       - master
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
@@ -17,9 +22,9 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         emacs-version:
-          - 27.2
           - 28.2
-          - 29.3
+          - 29.4
+          - 30.2
         experimental: [false]
         include:
           - os: ubuntu-latest
@@ -31,12 +36,9 @@ jobs:
           - os: windows-latest
             emacs-version: snapshot
             experimental: true
-        exclude:
-          - os: macos-latest
-            emacs-version: 27.2
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v5
 
     - uses: jcs090218/setup-emacs@master
       with:

Eask

@@ -1,3 +1,5 @@
+;; -*- mode: eask; lexical-binding: t -*-
+
 (package "lsp-java"
          "3.0"
          "Java support for lsp-mode")
@@ -13,10 +15,10 @@
 
 (script "test" "echo \"Error: no test specified\" && exit 1")
 
-(source "gnu")
-(source "melpa")
+(source 'gnu)
+(source 'melpa)
 
-(depends-on "emacs" "27.1")
+(depends-on "emacs" "28.1")
 (depends-on "lsp-mode")
 (depends-on "markdown-mode")
 (depends-on "dash")

README.md

@@ -1,6 +1,6 @@
 [![MELPA](https://melpa.org/packages/lsp-java-badge.svg)](https://melpa.org/#/lsp-java)
 [![MELPA Stable](https://stable.melpa.org/packages/lsp-java-badge.svg)](https://stable.melpa.org/#/lsp-java)
-[![Build Status](https://github.com/emacs-lsp/lsp-java/workflows/CI/badge.svg?branch=master)](https://github.com/emacs-lsp/lsp-java/actions)
+[![CI](https://github.com/emacs-lsp/lsp-java/actions/workflows/test.yml/badge.svg)](https://github.com/emacs-lsp/lsp-java/actions/workflows/test.yml)
 [![Join the chat at https://gitter.im/emacs-lsp/lsp-mode](https://badges.gitter.im/emacs-lsp/lsp-mode.svg)](https://gitter.im/emacs-lsp/lsp-mode?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 lsp-java
@@ -284,6 +284,8 @@ Use http://download.eclipse.org/che/che-ls-jdt/snapshots/che-jdt-language-server
 * `lsp-java-code-generation-to-string-list-array-contents` - List contents of arrays instead of using native toString().
 * `lsp-java-code-generation-to-string-limit-elements` - Limit number of items in arrays/collections/maps to list, if 0 then list all.
 * `lsp-java-inhibit-message` - If non-nil, inhibit java messages echo via `inhibit-message'.
+* `lsp-java-sources-organize-imports-star-threshold` - Specifies the number of imports added before a star-import declaration is used.
+* `lsp-java-sources-organize-imports-static-star-threshold` - Specifies the number of static imports added before a star-import declaration is used.
 
 ## Additional packages
 * [lsp-ui](https://github.com/emacs-lsp/lsp-ui) : Flycheck, documentation and code actions support.