From 73902cee0db902fe31fe4958d1036c0fd214302c Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 7 Dec 2018 16:35:19 +0200 Subject: [PATCH 1/3] refactor build.grade 1. not to use task execute() 2. not to use leftShift --- build.gradle | 50 +++++++++++++++++++-------------------- test-app/app/build.gradle | 2 +- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 98437f3be..fe9b7801d 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ def useCCache = !project.hasProperty("noCCache") def isWinOs = System.properties['os.name'].toLowerCase().contains('windows') def pVersion = "no package version was provided by build.gradle build" def arVersion = "no commit sha was provided by build.gradle build" -def generateRegularRuntimePackage = !project.hasProperty("skipUnoptimized"); +def generateRegularRuntimePackage = !project.hasProperty("skipUnoptimized") def DIST_PATH = "$rootDir/dist" def TEST_APP_PATH = "$rootDir/test-app" @@ -120,9 +120,9 @@ task generateDtsgJar(type: Exec) { doFirst { workingDir "$TEST_APP_PATH" if (isWinOs) { - commandLine "cmd", "/c", "gradlew", ":dts-generator:jar" + commandLine "cmd", "/c", "gradlew", ":dts-generator:jar", "--warning-mode", "all" } else { - commandLine "./gradlew", ":dts-generator:jar" + commandLine "./gradlew", ":dts-generator:jar", "--warning-mode", "all" } } } @@ -131,9 +131,9 @@ task generateSbgJar(type: Exec) { doFirst { workingDir "$TEST_APP_PATH" if (isWinOs) { - commandLine "cmd", "/c", "gradlew", ":static-binding-generator:jar" + commandLine "cmd", "/c", "gradlew", ":static-binding-generator:jar", "--warning-mode", "all" } else { - commandLine "./gradlew", ":static-binding-generator:jar" + commandLine "./gradlew", ":static-binding-generator:jar", "--warning-mode", "all" } } } @@ -142,21 +142,9 @@ task generateMdgJar(type: Exec) { doFirst { workingDir "$TEST_APP_PATH" if (isWinOs) { - commandLine "cmd", "/c", "gradlew", ":android-metadata-generator:jar" + commandLine "cmd", "/c", "gradlew", ":android-metadata-generator:jar", "--warning-mode", "all" } else { - commandLine "./gradlew", ":android-metadata-generator:jar" - } - } -} - -task generateRuntime { - doFirst { - tasks.generateOptimizedRuntimeAar.execute(); - - tasks.generateOptimizedWithInspectorRuntimeAar.execute(); - - if (generateRegularRuntimePackage) { - tasks.generateRuntimeAar.execute(); + commandLine "./gradlew", ":android-metadata-generator:jar", "--warning-mode", "all" } } } @@ -165,9 +153,9 @@ task cleanRuntime (type: Exec) { doFirst { workingDir "$TEST_APP_PATH" if (isWinOs) { - commandLine "cmd", "/c", "gradlew", ":runtime:clean" + commandLine "cmd", "/c", "gradlew", ":runtime:clean", "--warning-mode", "all" } else { - commandLine "./gradlew", ":runtime:clean" + commandLine "./gradlew", ":runtime:clean", "--warning-mode", "all" } } } @@ -186,6 +174,7 @@ def getAssembleReleaseBuildArguments = { -> if (useCCache) { arguments.push("-PuseCCache") } + arguments += ["--warning-mode", "all"] return arguments; } @@ -344,9 +333,17 @@ createDistDir.dependsOn(generateMdgJar) getPackageVersion.dependsOn(createDistDir) getCommitVersion.dependsOn(getPackageVersion) -generateRuntime.dependsOn(getCommitVersion) +generateOptimizedRuntimeAar.dependsOn(getCommitVersion) + +generateOptimizedWithInspectorRuntimeAar.dependsOn(generateOptimizedRuntimeAar) + +if (generateRegularRuntimePackage) { + generateRuntimeAar.dependsOn(generateOptimizedWithInspectorRuntimeAar) + buildJsParser.dependsOn(generateRuntimeAar) +} else { + buildJsParser.dependsOn(generateOptimizedWithInspectorRuntimeAar) +} -buildJsParser.dependsOn(generateRuntime) copyFilesToProjectTemeplate.dependsOn(buildJsParser) copyProjectTemplate.dependsOn(copyFilesToProjectTemeplate) copyPackageJson.dependsOn(copyProjectTemplate) @@ -377,9 +374,9 @@ task runSbgTests (type: Exec, dependsOn: 'runAstTests') { doFirst { workingDir "$TEST_APP_PATH" if (isWinOs) { - commandLine "cmd", "/c", "gradlew", ":static-binding-generator:test" + commandLine "cmd", "/c", "gradlew", ":static-binding-generator:test", "--warning-mode", "all" } else { - commandLine "./gradlew", ":static-binding-generator:test" + commandLine "./gradlew", ":static-binding-generator:test", "--warning-mode", "all" } } } @@ -391,13 +388,14 @@ def getRunTestsBuildArguments = { taskName -> } else { arguments.push("./gradlew") } - arguments +=["-b", "runtests.gradle", taskName] + arguments += ["-b", "runtests.gradle", taskName] if (onlyX86) { arguments.push("-PonlyX86") } if (useCCache) { arguments.push("-PuseCCache") } + arguments += ["--warning-mode", "all"] return arguments; } diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle index 8402f67ae..fb7516898 100644 --- a/test-app/app/build.gradle +++ b/test-app/app/build.gradle @@ -559,7 +559,7 @@ task buildMetadata(type: JavaExec) { } } -task makeAndroidXChanges << { +task makeAndroidXChanges { if (project.hasProperty("useAndroidX") && (useAndroidX || useAndroidX.toBoolean())) { // code changes def codeTuples = new ArrayList>() From b03942fa6c59f03b87673f153481ecee1d0c4119 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 7 Dec 2018 16:45:53 +0200 Subject: [PATCH 2/3] use .add instead of .push as in 5.0 it adds the items in front --- build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index fe9b7801d..4a75c7334 100644 --- a/build.gradle +++ b/build.gradle @@ -165,24 +165,24 @@ def getAssembleReleaseBuildArguments = { -> if (isWinOs) { arguments += ["cmd", "/c", "gradlew"] } else { - arguments.push("./gradlew") + arguments.add("./gradlew") } arguments += [":runtime:assembleRelease", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}"] if (onlyX86) { - arguments.push("-PonlyX86") + arguments.add("-PonlyX86") } if (useCCache) { - arguments.push("-PuseCCache") + arguments.add("-PuseCCache") } arguments += ["--warning-mode", "all"] - return arguments; + return arguments } task generateOptimizedRuntimeAar (type: Exec) { doFirst { workingDir "$TEST_APP_PATH" def arguments = getAssembleReleaseBuildArguments() - arguments.push("-Poptimized") + arguments.add("-Poptimized") commandLine arguments } } @@ -191,7 +191,7 @@ task generateOptimizedWithInspectorRuntimeAar (type: Exec) { doFirst { workingDir "$TEST_APP_PATH" def arguments = getAssembleReleaseBuildArguments() - arguments.push("-PoptimizedWithInspector") + arguments.add("-PoptimizedWithInspector") commandLine arguments } } @@ -386,14 +386,14 @@ def getRunTestsBuildArguments = { taskName -> if (isWinOs) { arguments += ["cmd", "/c", "gradlew"] } else { - arguments.push("./gradlew") + arguments.add("./gradlew") } arguments += ["-b", "runtests.gradle", taskName] if (onlyX86) { - arguments.push("-PonlyX86") + arguments.add("-PonlyX86") } if (useCCache) { - arguments.push("-PuseCCache") + arguments.add("-PuseCCache") } arguments += ["--warning-mode", "all"] return arguments; From 3048f4fff7907d14c35b62a9935dc7eefe14a78c Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 7 Dec 2018 17:40:09 +0200 Subject: [PATCH 3/3] update dts generator to the latest version --- test-app/build-tools/android-dts-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-app/build-tools/android-dts-generator b/test-app/build-tools/android-dts-generator index cce79ede4..32ad4e004 160000 --- a/test-app/build-tools/android-dts-generator +++ b/test-app/build-tools/android-dts-generator @@ -1 +1 @@ -Subproject commit cce79ede41dee84aee7e967dc5326a0e2d00f359 +Subproject commit 32ad4e0042e4af4a86761734b001ec7022f6135f