diff --git a/build.gradle b/build.gradle index ae8169ca0d3..a2635fca2a7 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ install4j { } task wrapper(type: Wrapper) { - gradleVersion = '2.14.1' + gradleVersion = '3.0' } @@ -66,8 +66,8 @@ configurations { databaseTestCompile.extendsFrom testCompile databaseTestRuntime.extendsFrom testRuntime - integrationTestCompile.extendsFrom testCompile - integrationTestRuntime.extendsFrom testRuntime + integrationTestCompile.extendsFrom testCompile + integrationTestRuntime.extendsFrom testRuntime } dependencies { @@ -142,7 +142,7 @@ sourceSets { runtimeClasspath += main.output + test.output } } - integrationTest { + integrationTest { java { compileClasspath += main.output + test.output runtimeClasspath += main.output + test.output @@ -158,6 +158,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") {