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

Add filteringCharset = 'UTF-8' to gradle #1945

Merged
merged 1 commit into from
Sep 11, 2016
Merged

Add filteringCharset = 'UTF-8' to gradle #1945

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
10 changes: 6 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ install4j {
}

task wrapper(type: Wrapper) {
gradleVersion = '2.14.1'
gradleVersion = '3.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not necessary anymore. See https://gradle.org/blog/gradle-3-0-m1-unleash-the-daemon/

./gradlew wrapper --gradle-version 3.0 has the same effect as ./gradlew wrapper with that config.

I'll just change it directly in the master branch.

}


Expand All @@ -62,8 +62,8 @@ configurations {
databaseTestCompile.extendsFrom testCompile
databaseTestRuntime.extendsFrom testRuntime

integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime
}

dependencies {
Expand Down Expand Up @@ -136,7 +136,7 @@ sourceSets {
runtimeClasspath += main.output + test.output
}
}
integrationTest {
integrationTest {
java {
compileClasspath += main.output + test.output
runtimeClasspath += main.output + test.output
Expand All @@ -152,6 +152,8 @@ processResources {
"year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)),
"authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "),
"developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "))

filteringCharset = 'UTF-8'
}

filesMatching("resource/**/meta.xml") {
Expand Down