Skip to content

Commit

Permalink
Merge branch 'main' into issue-1367-fix-multiple-impl-not-all-with-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
krzysztof-owczarek authored Feb 10, 2025
2 parents 93a9568 + 13a2bc9 commit 07d72da
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 44 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4.6.0
uses: actions/setup-java@v4.7.0
with:
distribution: 'zulu'
java-version: ${{ env.build_java_version }}
Expand Down Expand Up @@ -53,12 +53,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Build JDK
uses: actions/setup-java@v4.6.0
uses: actions/setup-java@v4.7.0
with:
distribution: 'zulu'
java-version: ${{ env.build_java_version }}
- name: Set up Test JDK
uses: actions/setup-java@v4.6.0
uses: actions/setup-java@v4.7.0
with:
distribution: 'zulu'
java-version: ${{ matrix.test_java_version }}
Expand Down Expand Up @@ -103,12 +103,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Build JDK
uses: actions/setup-java@v4.6.0
uses: actions/setup-java@v4.7.0
with:
distribution: 'zulu'
java-version: ${{ env.build_java_version }}
- name: Set up Test JDK
uses: actions/setup-java@v4.6.0
uses: actions/setup-java@v4.7.0
with:
distribution: 'zulu'
java-version: ${{ matrix.test_java_version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-gradle-wrapper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install Gradle JDK
uses: actions/setup-java@v4.6.0
uses: actions/setup-java@v4.7.0
with:
distribution: 'zulu'
java-version: 17

- name: Update Gradle Wrapper
uses: gradle-update/[email protected].0
uses: gradle-update/[email protected].1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'archunit.base-conventions'
id 'com.gradleup.shadow' version '8.3.5' apply false
id 'com.github.spotbugs' version '6.1.2' apply false
id 'com.gradleup.shadow' version '8.3.6' apply false
id 'com.github.spotbugs' version '6.1.3' apply false
id "io.github.gradle-nexus.publish-plugin" version "2.0.0" apply false
id "com.diffplug.spotless" version "7.0.2" apply false
id 'com.github.ben-manes.versions' version '0.52.0' apply false
Expand Down
2 changes: 1 addition & 1 deletion docs/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "github-pages", "~> 231", group: :jekyll_plugins
gem "github-pages", "~> 232", group: :jekyll_plugins

# meanwhile this dependency also seem to be necessary to run Jekyll with current Ruby
gem "webrick"
Expand Down
66 changes: 33 additions & 33 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3.2)
activesupport (7.1.3.4)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -11,19 +11,20 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
bigdecimal (3.1.7)
bigdecimal (3.1.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
colorator (1.1.0)
commonmarker (0.23.10)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
connection_pool (2.4.1)
dnsruby (1.72.0)
csv (3.3.0)
dnsruby (1.72.2)
simpleidn (~> 0.2.1)
drb (2.2.1)
em-websocket (0.5.3)
Expand All @@ -33,19 +34,20 @@ GEM
ffi (>= 1.15.0)
eventmachine (1.2.7)
execjs (2.9.1)
faraday (2.9.0)
faraday (2.10.1)
faraday-net_http (>= 2.0, < 3.2)
faraday-net_http (3.1.0)
logger
faraday-net_http (3.1.1)
net-http
ffi (1.16.3)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
gemoji (4.1.0)
github-pages (231)
github-pages (232)
github-pages-health-check (= 1.18.2)
jekyll (= 3.9.5)
jekyll (= 3.10.0)
jekyll-avatar (= 0.8.0)
jekyll-coffeescript (= 1.2.2)
jekyll-commonmark-ghpages (= 0.4.0)
jekyll-commonmark-ghpages (= 0.5.1)
jekyll-default-layout (= 0.1.5)
jekyll-feed (= 0.17.0)
jekyll-gist (= 1.5.0)
Expand Down Expand Up @@ -82,9 +84,10 @@ GEM
liquid (= 4.0.4)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.13.6, < 2.0)
nokogiri (>= 1.16.2, < 2.0)
rouge (= 3.30.0)
terminal-table (~> 1.4)
webrick (~> 1.8)
github-pages-health-check (1.18.2)
addressable (~> 2.3)
dnsruby (~> 1.60)
Expand All @@ -95,11 +98,12 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (3.9.5)
jekyll (3.10.0)
addressable (~> 2.4)
colorator (~> 1.0)
csv (~> 3.0)
em-websocket (~> 0.5)
i18n (>= 0.7, < 2)
jekyll-sass-converter (~> 1.0)
Expand All @@ -110,16 +114,17 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
webrick (>= 1.0)
jekyll-avatar (0.8.0)
jekyll (>= 3.0, < 5.0)
jekyll-coffeescript (1.2.2)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
jekyll-commonmark (1.4.0)
commonmarker (~> 0.22)
jekyll-commonmark-ghpages (0.4.0)
commonmarker (~> 0.23.7)
jekyll (~> 3.9.0)
jekyll-commonmark-ghpages (0.5.1)
commonmarker (>= 0.23.7, < 1.1.0)
jekyll (>= 3.9, < 4.0)
jekyll-commonmark (~> 1.4.0)
rouge (>= 2.0, < 5.0)
jekyll-default-layout (0.1.5)
Expand Down Expand Up @@ -213,29 +218,29 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.0)
mercenary (0.3.6)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.22.3)
minitest (5.24.1)
mutex_m (0.2.0)
net-http (0.4.1)
uri
nokogiri (1.16.5-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.5)
racc (1.7.3)
public_suffix (5.1.1)
racc (1.8.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.9)
rouge (3.30.0)
rubyzip (2.3.2)
safe_yaml (1.0.5)
Expand All @@ -247,27 +252,22 @@ GEM
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
simpleidn (0.2.1)
unf (~> 0.1.4)
strscan (3.1.0)
simpleidn (0.2.3)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (1.8.0)
uri (0.13.0)
webrick (1.8.1)
webrick (1.9.1)

PLATFORMS
x86_64-linux

DEPENDENCIES
github-pages (~> 231)
github-pages (~> 232)
jekyll-feed
jekyll-gist
jekyll-paginate
Expand Down
2 changes: 1 addition & 1 deletion docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import static java.nio.charset.StandardCharsets.UTF_8

plugins {
id 'archunit.base-conventions'
id "org.asciidoctor.jvm.convert" version "3.3.2"
id "org.asciidoctor.jvm.convert" version "4.0.4"
}

task cleanUserGuide(type: Delete) {
Expand Down

0 comments on commit 07d72da

Please sign in to comment.