diff options
| author | Sebastien Hertz <shertz@google.com> | 2017-09-11 11:03:26 +0200 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2017-09-11 11:03:26 +0200 |
| commit | 9006e9c85e7f2c28fe0b21b02ad91f7b1e12d372 (patch) | |
| tree | 32dbae64ba1cd516efaa758cdd565ac4490a22d4 /build.gradle | |
| parent | dbc024a997762158855aeca1f60d2c45ae690a0f (diff) | |
| download | r8-9006e9c85e7f2c28fe0b21b02ad91f7b1e12d372.tar.gz | |
Create gradle task for kotlin compiler
Also upgrade kotlin runtime dependencies to the same version.
Change-Id: Ie68a2f4479e5098528e13dd5540cfa1d34c28b24
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle index 4060a7ac5..934c6509c 100644 --- a/build.gradle +++ b/build.gradle @@ -136,7 +136,7 @@ dependencies { supportLibs 'com.android.support:support-v4:25.4.0' supportLibs 'junit:junit:4.12' supportLibs 'com.android.support.test.espresso:espresso-core:3.0.0' - debugTestResourcesKotlinCompileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.1.3' + debugTestResourcesKotlinCompileOnly 'org.jetbrains.kotlin:kotlin-stdlib:1.1.4-3' } protobuf { @@ -588,17 +588,9 @@ task buildDebugTestResourcesJars { } def kotlinResourcesDir = file("src/test/debugTestResourcesKotlin") def kotlinHostJar = "debug_test_resources_kotlin.jar" - task "jar_debugTestResourcesKotlin"(type: Exec) { - if (OperatingSystem.current().isWindows()) { - executable file("third_party/kotlin/kotlinc/bin/kotlinc.bat") - } else { - executable file("third_party/kotlin/kotlinc/bin/kotlinc"); - } - args "-include-runtime" - args "-nowarn" - args "-d" - args "build/test/${kotlinHostJar}" - args fileTree(dir: kotlinResourcesDir, include: '**/*.kt') + task "jar_debugTestResourcesKotlin"(type: kotlin.Kotlinc) { + source = fileTree(dir: kotlinResourcesDir, include: '**/*.kt') + destination = file("build/test/${kotlinHostJar}") } dependsOn downloadDeps dependsOn jar_debugTestResources |