Skip to content
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

Jump to bottom

Chore/update dependencies #38

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Chore/update dependencies #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82f6c93
Updated `xHtmlRenderer` and `iText` dependencies
Jul 31, 2017
5fe39c9
Used basic `http` when fetching gradle
Jul 31, 2017
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
13 changes: 6 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ buildscript {
}
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
classpath "io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2"
}
}

plugins {
id "io.spring.dependency-management" version "0.5.2.RELEASE"
id "com.jfrog.bintray" version "1.2"
}

version "2.0.3"
group "org.grails.plugins"

Expand All @@ -26,6 +23,8 @@ apply plugin: "spring-boot"
apply plugin: "org.grails.grails-plugin"
apply plugin: "org.grails.grails-gsp"
apply plugin: "org.grails.grails-doc"
apply plugin: "io.spring.dependency-management"
apply plugin: "com.jfrog.bintray"
// Used for publishing to central repository, remove if not needed
apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/grailsCentralPublishing.gradle'
apply from:'https://raw.githubusercontent.com/grails/grails-profile-repository/master/profiles/plugin/templates/bintrayPublishing.gradle'
Expand Down Expand Up @@ -54,8 +53,8 @@ dependencyManagement {

dependencies {

compile("org.xhtmlrenderer:core-renderer:R8")
compile("com.lowagie:itext:2.1.0")
compile("org.xhtmlrenderer:flying-saucer-pdf:9.1.6")
compile("com.lowagie:itext:2.1.7")
testCompile("org.apache.pdfbox:pdfbox:1.0.0") {
exclude module:'jempbox'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-bin.zip
6 changes: 3 additions & 3 deletions src/main/groovy/grails/plugins/rendering/datauri/DataUriAwareITextUserAgent.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ class DataUriAwareITextUserAgent extends ITextUserAgent {
def image = Image.getInstance(dataUri.bytes)
def factor = sharedContext.dotsPerPixel
image.scaleAbsolute((image.plainWidth * factor) as float, (image.plainHeight * factor) as float)
resource = new ImageResource(new ITextFSImage(image))
resource = new ImageResource(uri, new ITextFSImage(image))
_imageCache.put(uri, resource)
resource
} catch (Exception e) {
GrailsUtil.deepSanitize(e)
log.error("exception creating image from data uri (will use empty image): $dataUri", e)
new ImageResource(null)
new ImageResource(uri, null)
}
} else {
log.error("data uri has a non image mime type (will use empty image): $dataUri")
new ImageResource(null)
new ImageResource(uri, null)
}
} else {
super.getImageResource(uri)
Expand Down