Merge pull request uber-common#7 from runningcode/no/move-directories-up

Move Gradle Home and Gradle Profiler directories up.

Author: oliviernotteghem

mobile_app1/.gitignore renamed to .gitignore

@@ -1,5 +1,8 @@
+.DS_Store
+
 build/
 .gradle
 gradle-user-home
 profile-out-*
 
+.java-version

README.md

@@ -73,7 +73,7 @@ Benchmark scenario are as follow :
 
 #### Current results
 
-![apps_presidio_helix_app results](/output/mobile_app1.png)
+![apps_presidio_helix_app results](/results/mobile_app1.png)
 
 ### License
 

mobile_app1/benchmark.sh

@@ -6,11 +6,11 @@ if ! [ -x "$(command -v bazel)" ]; then
 fi
 
 if [[ -z "$GRADLE_PROFILER" ]]; then
-  if ! [ -d "gradle-profiler" ]
+  if ! [ -d "../gradle-profiler" ]
   then
      echo "Installing Gradle profiler.."
-     git clone https://github.com/sunyal/gradle-profiler.git
-     cd gradle-profiler || exit
+     git clone https://github.com/sunyal/gradle-profiler.git ../gradle-profiler
+     cd ../gradle-profiler || exit
 
      # gradle dist in repo points to an obsolete snapshot.
      sed -i -e 's/4.8-20180417000132+0000/4.8/g' gradle/wrapper/gradle-wrapper.properties
@@ -20,7 +20,7 @@ if [[ -z "$GRADLE_PROFILER" ]]; then
      echo Grade Profile installed successful! Please restart benchmark.
      exit 0
   fi
-  GRADLE_PROFILER=./gradle-profiler/build/install/gradle-profiler/bin/gradle-profiler
+  GRADLE_PROFILER=../gradle-profiler/build/install/gradle-profiler/bin/gradle-profiler
 else
     if ! [ -e "$GRADLE_PROFILER" ]
     then
@@ -30,10 +30,10 @@ else
 fi
 
 BASEDIR=$(dirname "$0")
-GRADLE_VERSION=6.7
+GRADLE_VERSION=6.7.1
 
 timestampDir=$(date +"%Y%m%d_%H%M%S")
-outputDir=output/$timestampDir
+outputDir=../output/$timestampDir
 iterations=2
 warmups=1
 
@@ -45,7 +45,7 @@ mkdir -p "$outputDir"/
 $GRADLE_PROFILER --benchmark --gradle-version $GRADLE_VERSION $2 --iterations=$iterations --warmups=$warmups --output-dir="$outputDir"/buck --scenario-file "$BASEDIR/performance.scenarios" --project-dir . --buck
 
 # shellcheck disable=SC2086
-$GRADLE_PROFILER --benchmark --gradle-version $GRADLE_VERSION $2 --iterations=$iterations --warmups=$warmups --output-dir="$outputDir"/gradle --scenario-file "$BASEDIR/performance.scenarios" --project-dir .
+$GRADLE_PROFILER --benchmark --gradle-version $GRADLE_VERSION $2 --iterations=$iterations --warmups=$warmups --output-dir="$outputDir"/gradle --scenario-file "$BASEDIR/performance.scenarios" --project-dir . --gradle-user-home ../gradle-user-home
 
 # shellcheck disable=SC2086
 $GRADLE_PROFILER --benchmark --gradle-version $GRADLE_VERSION $2 --iterations=$iterations --warmups=$warmups --output-dir="$outputDir"/bazel --scenario-file "$BASEDIR/performance.scenarios" --project-dir . --bazel