From 5f4c15de2b57848ec3bff4db4cdbb9c3b7bb498c Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Thu, 22 Feb 2018 16:47:42 +0100
Subject: [PATCH] Update proxy-witness and disable its cache

---
 gradle/reprod/prepareCache.sh | 21 ---------------------
 gradle/reprod/setup.sh        |  7 +++++--
 2 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100755 gradle/reprod/prepareCache.sh

diff --git a/gradle/reprod/prepareCache.sh b/gradle/reprod/prepareCache.sh
deleted file mode 100755
index 849692d0..00000000
--- a/gradle/reprod/prepareCache.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Collects build artifacts that aren't present in the online cache
-# into a subfolder that can be merged with the online cache
-# This script isn't expected to function on OSX.
-
-set -e
-set -x
-
-# Step one: copy all artifacts into subfolder under new name
-rm -rf artifactCache
-mkdir artifactCache
-cd artifactCache
-for f in $(find ../deps/repo -type f); do
-    cp $f $(sha256sum $f | cut -d' ' -f1)
-done
-
-# Step two: remove all files that are already in the cache
-for f in *; do
-    if wget -q --spider "https://www.johni0702.de/replaymod/artifact/$f"; then
-        rm $f
-    fi
-done
diff --git a/gradle/reprod/setup.sh b/gradle/reprod/setup.sh
index a88fdba4..1ec58939 100755
--- a/gradle/reprod/setup.sh
+++ b/gradle/reprod/setup.sh
@@ -15,7 +15,7 @@ sha256val () {
 
 # Setup http(s) proxy
 url="https://github.com/johni0702/proxy-witness"
-commit="17ebb2e22f812faed9a28bae6bf1d8b28f798d56"
+commit="01f5aa9eb6fa14a0adfa832ba33b6f7c68138c26"
 if [ ! -d "deps/proxy-witness" ] || [ "$(git -C "deps/proxy-witness" rev-parse $commit^{commit})" != "$commit" ]; then
     rm -rf "deps/proxy-witness"
     mkdir -p "deps/proxy-witness"
@@ -31,7 +31,10 @@ pushd "deps/proxy-witness"
     ./gradlew $PROXY_SETTINGS build -x test -x javadoc
 popd
 
-java -Dproxywitness.httpUris=http://export.mcpbot.bspk.rs/versions.json -jar deps/proxy-witness/build/libs/proxy-witness.jar "$PROXY_PORT" checksums.txt > proxy.log 2>&1 &
+java -Dproxywitness.httpUris=http://export.mcpbot.bspk.rs/versions.json \
+     -Dproxywitness.useCache=false \
+     -jar deps/proxy-witness/build/libs/proxy-witness.jar \
+     "$PROXY_PORT" checksums.txt > proxy.log 2>&1 &
 proxy_pid=$!
 trap "kill $proxy_pid" EXIT