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

FIX #220 skip unix permission check on windows when loading webp binaries #221

Merged
merged 1 commit into from
Feb 1, 2021
Merged

FIX #220 skip unix permission check on windows when loading webp binaries #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions buildSrc/src/main/kotlin/Libs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ object Libs {
const val kotlinVersion = "1.4.21"

const val org = "com.sksamuel.scrimage"
const val CommonsIoVersion = "2.6"
const val CommonsIoVersion = "2.6"
const val CommonsLangVersion = "3.11"

object TwelveMonkeys {
private const val Version = "3.6"
Expand Down Expand Up @@ -40,6 +41,7 @@ object Libs {
}

object Commons {
const val io = "commons-io:commons-io:$CommonsIoVersion"
const val io = "commons-io:commons-io:$CommonsIoVersion"
const val lang = "org.apache.commons:commons-lang3:$CommonsLangVersion"
}
}
1 change: 1 addition & 0 deletions scrimage-webp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {

dependencies {
api(project(":scrimage-core"))
implementation(Libs.Commons.lang)
testImplementation(Libs.Kotest.junit5)
testImplementation(Libs.Kotest.assertions)
}
Expand Down
7 changes: 6 additions & 1 deletion scrimage-webp/src/main/java/com/sksamuel/scrimage/webp/WebpHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.sksamuel.scrimage.webp;

import org.apache.commons.lang3.SystemUtils;

import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
Expand All @@ -20,7 +22,10 @@ protected static void installBinary(Path output, String... sources) throws IOExc
if (in != null) {
Files.copy(in, output, StandardCopyOption.REPLACE_EXISTING);
in.close();
setExecutable(output);

if(!SystemUtils.IS_OS_WINDOWS) {
setExecutable(output);
}
return;
}
}
Expand Down