Skip to content

Try to use new symbol API #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uhafner merged 4 commits into from
Mar 12, 2023
Merged

Try to use new symbol API #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0d6d36
Try to use new symbol API.
uhafner Sep 23, 2022
5f3255c
Remove the prefixes `plugin` and `symbol` from the symbol identifier.
uhafner Sep 23, 2022
f16cf4d
Use new `withRaw` API method for symbols.
uhafner Nov 29, 2022
599a330
Merge remote-tracking branch 'origin/main' into expose-symbols
uhafner Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<revision>1.29.0-2</revision>
<changelist>-SNAPSHOT</changelist>

<jenkins.baseline>2.346</jenkins.baseline>
<jenkins.version>2.380-rc33164.1fa_0f3ffcdb_c</jenkins.version>

<module.name>${project.groupId}.prism</module.name>

<testcontainers.version>1.17.5</testcontainers.version>
Expand Down
20 changes: 20 additions & 0 deletions skip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

set -e

JENKINS_HOME=../docker/volumes/jenkins-home

mvn clean install -Pskip || { echo "Build failed"; exit 1; }

echo "Installing plugin in $JENKINS_HOME"

rm -rf $JENKINS_HOME/plugins/prism-api-plugin*
cp -fv target/prism-api.hpi $JENKINS_HOME/plugins/prism-api.jpi

CURRENT_UID="$(id -u):$(id -g)"
export CURRENT_UID
IS_RUNNING=$(docker-compose ps -q jenkins-controller)
if [[ "$IS_RUNNING" != "" ]]; then
docker-compose restart
echo "Restarting Jenkins (docker compose with user ID ${CURRENT_UID}) ..."
fi
13 changes: 7 additions & 6 deletions src/main/java/io/jenkins/plugins/prism/SourcePrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.jenkins.ui.symbol.Symbol;
import org.jenkins.ui.symbol.SymbolRequest;

import edu.hm.hafner.util.LookaheadStream;
import edu.hm.hafner.util.VisibleForTesting;
Expand All @@ -13,7 +15,6 @@
import j2html.tags.UnescapedText;

import io.jenkins.plugins.fontawesome.api.SvgTag;
import io.jenkins.plugins.fontawesome.api.SvgTag.FontAwesomeStyle;
import io.jenkins.plugins.util.JenkinsFacade;

import static j2html.TagCreator.*;
Expand Down Expand Up @@ -103,11 +104,11 @@ private ContainerTag createBox(final Marker marker) {

private DomContent createIcon(final String name) {
if (name.startsWith("symbol")) {
// TODO: replace with Jenkins symbol tag once https://github.com/jenkinsci/jenkins/pull/6659 is merged
return new UnescapedText(
new SvgTag("bookmark", jenkinsFacade, FontAwesomeStyle.REGULAR)
.withClasses(ICON_MD)
.render());
String symbol = Symbol.get(new SymbolRequest.Builder()
.withRaw(name)
.withClasses(ICON_MD)
.build());
return new UnescapedText(symbol);
}
return img().withSrc(jenkinsFacade.getImagePath(name)).withClasses(ICON_MD);
}
Expand Down