Skip to content

Commit 2337c07

Browse files
wdziemiaWalter Dziemianczyk
andauthored
Mark StoneTask as cacheable and reolve some dbapp integration issues (#515)
Co-authored-by: Walter Dziemianczyk <wdziemia@dropbox.com>
1 parent 68f4dee commit 2337c07

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

android/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ plugins {
22
id 'com.android.library'
33
id 'org.jetbrains.kotlin.android'
44
id "org.jetbrains.kotlinx.binary-compatibility-validator"
5-
alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin)
6-
alias(dropboxJavaSdkLibs.plugins.gradle.version.plugin)
7-
alias(dropboxJavaSdkLibs.plugins.dependency.guard)
5+
id "com.vanniktech.maven.publish"
6+
id "com.github.ben-manes.versions"
7+
id "com.dropbox.dependency-guard"
88
}
99

1010
android {
11+
namespace = "com.dropbox.core.sdk.android"
1112
compileSdk dropboxJavaSdkLibs.versions.android.compile.sdk.get().toInteger()
1213
defaultConfig {
1314
minSdk dropboxJavaSdkLibs.versions.android.min.sdk.get().toInteger()

core/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ ext {
2828
}
2929

3030
tasks.register('versionWriterTask') {
31-
def versionName = project.property("VERSION_NAME")
31+
String versionName
32+
if (project.hasProperty("VERSION_NAME")) {
33+
versionName = "${project.property("VERSION_NAME")}"
34+
} else {
35+
versionName = project.version
36+
}
3237
it.inputs.property("versionName", versionName)
3338

3439
def generatedDir = project.layout.buildDirectory.dir("generated/version")

stone-java-gradle-plugin/src/main/kotlin/com/dropbox/stone/java/StoneTask.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@ import org.gradle.api.file.DirectoryProperty
66
import org.gradle.api.file.RegularFileProperty
77
import org.gradle.api.provider.ListProperty
88
import org.gradle.api.provider.Property
9-
import org.gradle.api.tasks.Input
10-
import org.gradle.api.tasks.InputDirectory
11-
import org.gradle.api.tasks.InputFile
12-
import org.gradle.api.tasks.OutputDirectory
13-
import org.gradle.api.tasks.TaskAction
14-
import org.gradle.api.tasks.Optional
9+
import org.gradle.api.tasks.*
1510
import org.gradle.process.ExecOperations
1611
import java.io.File
1712
import java.io.FileOutputStream
1813
import javax.inject.Inject
1914

15+
@CacheableTask
2016
abstract class StoneTask : DefaultTask() {
2117

2218
@get:Inject
@@ -26,16 +22,20 @@ abstract class StoneTask : DefaultTask() {
2622
abstract val stoneConfigs: ListProperty<StoneConfig>
2723

2824
@get:InputDirectory
25+
@get:PathSensitive(PathSensitivity.RELATIVE)
2926
abstract val generatorDir: DirectoryProperty
3027

3128
@get:InputDirectory
29+
@get:PathSensitive(PathSensitivity.RELATIVE)
3230
abstract val specDir: DirectoryProperty
3331

3432
@get:Optional
3533
@get:InputFile
34+
@get:PathSensitive(PathSensitivity.RELATIVE)
3635
abstract val routeWhitelistFilter: RegularFileProperty
3736

3837
@get:InputDirectory
38+
@get:PathSensitive(PathSensitivity.RELATIVE)
3939
abstract val stoneDir: DirectoryProperty
4040

4141
@get:Input

0 commit comments

Comments
 (0)