Skip to content
This repository was archived by the owner on Aug 19, 2020. It is now read-only.

Let Project scripts be cached in the Gradle build cache #978

Merged
merged 11 commits into from
Jul 20, 2018
Merged

Let Project scripts be cached in the Gradle build cache #978

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
96fa0e8
Remove unused `ScriptCache` scope parameter
bamboo Jul 18, 2018
ee3e80b
Extract `File.normalisedPath` extension
bamboo Jul 19, 2018
cd6276d
Add `KotlinScriptHost<*>` parameter to `cachedDirFor`
bamboo Jul 20, 2018
2201e46
Let `Project` scripts be cached in the Gradle build cache
bamboo Jul 20, 2018
4ce1bf1
Polish `LoadDirectory`
bamboo Jul 20, 2018
2c1d849
Compare sorted list of files to avoid file system ordering issues
bamboo Jul 20, 2018
01ab518
Rename `Commands.kt` => `BuildCacheCommands.kt`
bamboo Jul 20, 2018
68ac630
Reduce visibility of internal member to private
bamboo Jul 20, 2018
10b2dd9
Fix formatting gone wrong
bamboo Jul 20, 2018
68cbe2d
Annotate `BuildCacheIntegrationTest` with `LeaksFileHandles`
bamboo Jul 20, 2018
1c3001c
Ensure streams passed to build cache commands are closed
bamboo Jul 20, 2018
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
Prev Previous commit
Ensure streams passed to build cache commands are closed
  • Loading branch information
@bamboo
bamboo committed Jul 20, 2018
commit 1c3001c28ecd0065a52de67443ff560ecc3e38e4
13 changes: 7 additions & 6 deletions subprojects/provider/src/main/kotlin/org/gradle/kotlin/dsl/cache/BuildCacheFormat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ fun pack(inputDir: File, outputStream: OutputStream): Long {

var entryCount = 0L

val gzipOutputStream = GZIPOutputStream(outputStream)

DataOutputStream(gzipOutputStream).run {
DataOutputStream(GZIPOutputStream(outputStream)).useToRun {

val buffer = ByteArray(DEFAULT_BUFFER_SIZE)

Expand All @@ -58,16 +56,14 @@ fun pack(inputDir: File, outputStream: OutputStream): Long {
writeUTF("")
}

gzipOutputStream.finish()

return entryCount
}


internal
fun unpack(inputStream: InputStream, outputDir: File): Long =

DataInputStream(GZIPInputStream(inputStream)).run {
DataInputStream(GZIPInputStream(inputStream)).useToRun {

val buffer = ByteArray(DEFAULT_BUFFER_SIZE)

Expand Down Expand Up @@ -95,6 +91,11 @@ fun unpack(inputStream: InputStream, outputDir: File): Long =
}


private
inline fun <T : AutoCloseable, U> T.useToRun(action: T.() -> U): U =
use { run(action) }


private
fun File.copyTo(out: OutputStream, buffer: ByteArray) {
inputStream().use { input ->
Expand Down