diff --git a/build.gradle b/build.gradle index b1a0dd42a9..c24c6fccf2 100644 --- a/build.gradle +++ b/build.gradle @@ -84,8 +84,9 @@ buildscript { ext.deterministic_rt_version = '1.0-SNAPSHOT' - // Update 121 is required for ObjectInputFilter and at time of writing 131 was latest: - ext.java8_minUpdateVersion = '131' + // Update 121 is required for ObjectInputFilter. + // Updates [131, 161] also have zip compression bugs on MacOS (High Sierra). + ext.java8_minUpdateVersion = '171' repositories { mavenLocal() diff --git a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/DummyJar.kt b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/DummyJar.kt index c332860669..7e768fc80b 100644 --- a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/DummyJar.kt +++ b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/DummyJar.kt @@ -88,8 +88,7 @@ class DummyJar( jar.write(arrayOfJunk(DATA_SIZE)) // One uncompressed text file - val text = """ -Jar: ${_path.toAbsolutePath()} + val text = """Jar: ${_path.toAbsolutePath()} Class: ${testClass.name} """.toByteArray() jar.putNextEntry(uncompressed("comment.txt", text)) diff --git a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/JarFilterConfigurationTest.kt b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/JarFilterConfigurationTest.kt index a124545ae4..1e52fd4198 100644 --- a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/JarFilterConfigurationTest.kt +++ b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/JarFilterConfigurationTest.kt @@ -262,7 +262,7 @@ task jarFilter(type: JarFilterTask) { testProjectDir.newFile("build.gradle").writeText(script) return GradleRunner.create() .withProjectDir(testProjectDir.root) - .withArguments(getBasicArgsForTasks("jarFilter", "--stacktrace")) + .withArguments(getBasicArgsForTasks("jarFilter")) .withPluginClasspath() } diff --git a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/MetaFixConfigurationTests.kt b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/MetaFixConfigurationTests.kt index bb67dba0c2..84944f6a3f 100644 --- a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/MetaFixConfigurationTests.kt +++ b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/MetaFixConfigurationTests.kt @@ -69,7 +69,7 @@ task metafix(type: MetaFixerTask) { testProjectDir.newFile("build.gradle").writeText(script) return GradleRunner.create() .withProjectDir(testProjectDir.root) - .withArguments(getBasicArgsForTasks("metafix", "--stacktrace")) + .withArguments(getBasicArgsForTasks("metafix")) .withPluginClasspath() } diff --git a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/Utilities.kt b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/Utilities.kt index 62a0a36cff..b0bc5a6bfb 100644 --- a/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/Utilities.kt +++ b/buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/Utilities.kt @@ -29,7 +29,7 @@ private val testGradleUserHome: String get() = testGradleUserHomeValue ?: throw AssumptionViolatedException("System property 'test.gradle.user.home' not set.") fun getGradleArgsForTasks(vararg taskNames: String): MutableList = getBasicArgsForTasks(*taskNames).apply { add("--info") } -fun getBasicArgsForTasks(vararg taskNames: String): MutableList = mutableListOf(*taskNames, "-g", testGradleUserHome) +fun getBasicArgsForTasks(vararg taskNames: String): MutableList = mutableListOf(*taskNames, "--stacktrace", "-g", testGradleUserHome) @Throws(IOException::class) fun copyResourceTo(resourceName: String, target: Path) {