diff --git a/Android/build.gradle b/Android/build.gradle index c42d40d7..578a8a5b 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -37,6 +37,9 @@ android { major = 1 } } + twisterrob { + decorateBuildConfig = false + } buildTypes { release { minifyEnabled true diff --git a/AppEngine/build.gradle b/AppEngine/build.gradle index 63b29e99..8c9059f2 100644 --- a/AppEngine/build.gradle +++ b/AppEngine/build.gradle @@ -100,3 +100,21 @@ tasks.named("run").configure { JavaExec task -> task.environment(env) } } + +//noinspection UnnecessaryQualifiedReference +[ + // com.google.cloud.tools.gradle.appengine.core.CheckCloudSdkTask.class, // OK + com.google.cloud.tools.gradle.appengine.core.DownloadCloudSdkTask.class, // getProject() + com.google.cloud.tools.gradle.appengine.core.GcloudTask.class, // DeployExtension.gradleProject (except CloudSdkLoginTask) + com.google.cloud.tools.gradle.appengine.core.ShowConfigurationTask.class, // getProject() + com.google.cloud.tools.gradle.appengine.appyaml.StageAppYamlTask.class, // StageAppYamlExtension.project + getProject() + com.google.cloud.tools.gradle.appengine.standard.StageStandardTask.class, // StageStandardExtension.project + getProject() + com.google.cloud.tools.gradle.appengine.standard.DevAppServerRunTask.class, // RunExtension.project + com.google.cloud.tools.gradle.appengine.standard.DevAppServerStartTask.class, // RunExtension.project + com.google.cloud.tools.gradle.appengine.standard.DevAppServerStopTask.class, // RunExtension.project + com.google.cloud.tools.gradle.appengine.sourcecontext.GenRepoInfoFileTask.class, // GenRepoInfoFileExtension.project +].each { + tasks.withType(it).configureEach { + notCompatibleWithConfigurationCache("https://github.com/GoogleCloudPlatform/app-gradle-plugin/issues/454") + } +} diff --git a/Data/build.gradle b/Data/build.gradle index b6141aff..8e8c9a5d 100644 --- a/Data/build.gradle +++ b/Data/build.gradle @@ -51,8 +51,8 @@ idea { } tasks.register("runNetwork", JavaExec.class) { - def inputDir = "../temp/feed15/LULDLRRiverTramCable" - def outputDir = "output" + File inputDir = file("../temp/feed15/LULDLRRiverTramCable") + File outputDir = file("output") inputs.dir(inputDir).withPathSensitivity(PathSensitivity.RELATIVE) inputs.dir("src/data/PredictionSummary") outputs.dir(outputDir) @@ -61,6 +61,13 @@ tasks.register("runNetwork", JavaExec.class) { mainClass = "net.twisterrob.blt.data.apps.TravelNetworkParser" args = [ inputDir, outputDir ] enableAssertions = true + doFirst { + outputDir.mkdirs() + standardOutput = new File(outputDir, "runNetwork.log").newOutputStream() + } + doLast { + standardOutput.close() + } } tasks.register("runPostCode", JavaExec.class) { diff --git a/Data/output/.gitignore b/Data/output/.gitignore index 606aaaa1..6fc77830 100644 --- a/Data/output/.gitignore +++ b/Data/output/.gitignore @@ -1 +1,2 @@ /*.sql +/*.log diff --git a/buildSrc/src/main/groovy/net.twisterrob.blt.convention.gradle b/buildSrc/src/main/groovy/net.twisterrob.blt.convention.gradle index 475f3b3e..a7988075 100644 --- a/buildSrc/src/main/groovy/net.twisterrob.blt.convention.gradle +++ b/buildSrc/src/main/groovy/net.twisterrob.blt.convention.gradle @@ -10,3 +10,16 @@ tasks.withType(JavaCompile).configureEach { "-Xlint:-processing", ] } + +if (project.gradle.startParameter.isConfigurationCacheRequested()) { + // TODEL https://github.com/TWiStErRob/net.twisterrob.gradle/issues/511 + project.plugins.withId("com.android.application") { + project.VCS.setCurrent$twister_convention_versioning(new net.twisterrob.gradle.vcs.VCSExtension() { + @Override boolean isAvailableQuick() { return false } + @Override boolean isAvailable() { return isAvailableQuick() } + @Override String getRevision() { return "no VCS" } + @Override int getRevisionNumber() { return 0 } + @Override FileCollection files(Project project) { return project.files() } + }) + } +} diff --git a/gradle.properties b/gradle.properties index 496fb116..db98ac17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,8 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2048M -Dorg.gradle.deprecation.trace=true org.gradle.warning.mode=fail +org.gradle.configuration-cache=true +org.gradle.configuration-cache.problems=fail android.useAndroidX=true android.enableJetifier=true