Skip to content

Commit

Permalink
Fixes #1275. Fix unresolved dependency grolifant and okhttp-digest (#…
Browse files Browse the repository at this point in the history
…1278)

* Fixes #1275. Fix unresolved dependency grolifant and okhttp-digest

* Fix formatting

* Disable CI build on Java 8
  • Loading branch information
robertpanzer authored Aug 1, 2024
1 parent 9695d89 commit 9003f32
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
max-parallel: 4
matrix:
java:
- '8'
- '11'
- '17'
os:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Improvement::
Bug Fixes::

* CLI should set :mkdirs option by default (#1241) (@mojavelinux)
* Fix unresolvable dependency of JRuby Gradle plugin. (#1275)

== 2.5.10 (2023-06-04)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,27 @@

import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import kotlin.collections.ArrayDeque;
import okhttp3.*;
import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Test;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;

import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
import static org.asciidoctor.it.springboot.ProcessHelper.run;
import static org.assertj.core.api.Assertions.assertThat;

public class SpringBootTest {

final List<Process> testProcesses = new ArrayDeque<>();
final List<Process> testProcesses = new ArrayList<>();


@Test
Expand Down
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ buildscript {
}
dependencies {
classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:5.3.0"
classpath("com.github.jruby-gradle:jruby-gradle-plugin:2.0.1") {
exclude module: 'grolifant'
exclude module: 'okhttp-digest'
}
classpath 'org.ysb33r.gradle:grolifant:0.17.0'
}
}

Expand All @@ -24,7 +29,8 @@ plugins {
id "io.sdkman.vendors" version "2.0.0"
id "signing"
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
id 'com.github.jruby-gradle.base' version '2.0.0'
// Moved to dependency in buildscript. See https://github.com/asciidoctor/asciidoctorj/issues/1275
// id 'com.github.jruby-gradle.base' version '2.0.1'
id 'codenarc'
}

Expand Down

0 comments on commit 9003f32

Please sign in to comment.