Skip to content

Commit 891fb1c

Browse files
committed
Need java 21 for new jdt
1 parent 0aef126 commit 891fb1c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Install Java
6969
uses: actions/setup-java@v4
7070
with:
71-
java-version: 17
71+
java-version: 21
7272
distribution: 'temurin'
7373
- name: Build ycmd
7474
run: python3 ./install.py --force-sudo --ts-completer --clangd-completer --java-completer

test/docker/ci/image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apt-get update && \
2323
python3-pip \
2424
python3-setuptools \
2525
python3-wheel \
26-
openjdk-11-jdk-headless \
26+
openjdk-21-jdk-headless \
2727
nodejs \
2828
npm \
2929
vim-nox \

test/fixit.test.vim

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ function! Test_Ranged_Fixit_Works()
2727
call test_feedinput( "4\<CR>" )
2828
endfunction
2929

30-
call timer_start( 5000, funcref( 'SelectEntry' ) )
30+
let t = timer_start( 5000, funcref( 'SelectEntry' ) )
3131
'<,'>YcmCompleter FixIt
3232
redraw
3333

3434
call assert_match( ' String \(x\|string\) = "Did something useful: "' .
3535
\ ' + w.getWidgetInfo();', getline( 34 ) )
3636
call assert_match( ' System.out.println( \(x\|string\) );', getline( 35 ) )
37+
silent! call timer_stop( t )
3738
delfunction SelectEntry
3839
endfunction
3940

@@ -45,11 +46,12 @@ function! Test_Unresolved_Fixit_Works()
4546
redraw
4647
call test_feedinput( "2\<CR>" )
4748
endfunction
48-
call timer_start( 2000, funcref( 'SelectEntry' ) )
49+
let t = timer_start( 2000, funcref( 'SelectEntry' ) )
4950
YcmCompleter FixIt
5051
redraw
5152
call assert_equal( ' auto placeholder = 1;', getline( 3 ) )
5253
call assert_equal( ' printf("%s", placeholder);', getline( 4 ) )
5354
%bwipeout!
55+
silent! call timer_stop( t )
5456
delfunction SelectEntry
5557
endfunction

0 commit comments

Comments
 (0)