Update to batect 0.50.

charleskorn · Mar 24, 2020 · fc1e77f · fc1e77f
1 parent bb27f4f
commit fc1e77f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Gradle template
 .gradle
-.gradle-cache
+.batect/caches/
 
 build/
 !buildSrc/src/main/kotlin/com/charleskorn/kaml/build/

diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ services:
 
 env:
   global:
+    - BATECT_CACHE_TYPE=directory
     # GPG_KEY_PASSPHRASE:
     - secure: "iT+68YhJqPhlG0KR3GrNUlKf2pCaH4Hm4+4lY2byhlfeN3gakRPUBdfDjn6xzyziBXSLwj6EjUzZmMxCUQQGaENAhF3hrFtMRRFVOoLf3O4Uv8qMiIzk3Y7ULPRJPZzaqafW1a9K3LFNSHm47Wf2Wsf9rfO0dmatFkbsTMlJvb/FkbQWbqdDM7kxNNcpMQUmiFZ+j+sjWlabH+rc9Hi/uOjg95hHW4YWu4f43ROKzfaWX+75URAQ8Ih2Tw/oHNkvwMlOlVd9Csb5T3fvmTGBvdAPntLIdN/Iz7rionzMP3EUm2tC49A1PNRxLAEF4zNim9cHCbHGNpJnnWsPux9N128s+i1KMFtxZR5tBqSbX/gO2CN+SQJiSUvMx2Zu7NgRwsz1tYD8667i65//ZtrQbAvaSjxOSav0Q6Cdz/PlCWbfOmActwRxdEdrt+CtYnh2XyBmzLySDFqEjRCa5zedJrMJ2WbAxxmL/UgyMRYLbOEk5/7NR2q7ZX3FCWj+FJdQbRxayJ/6cltB4DYAXqdHv1hpWVgQGTfUkhiHunAuZygOl44pLeEWi4j6ETB8xzgscgcO0wzjToHcpnWQvDBnpkm26uCaR8jcn2ObEbBci1QdaRch9PfV81YIAL9Ssay/WQktGE/Ewe0Gm2DOcU0YWvU3BJixL50Wc1UBYGt+Xxw="
     - GPG_KEY_ID=6382A4D7
@@ -50,12 +51,12 @@ deploy:
       repo: charleskorn/kaml
 
 before_cache:
-  - rm -f  .gradle-cache/caches/modules-2/modules-2.lock
-  - rm -fr .gradle-cache/caches/*/plugin-resolution/
-  - rm -f  .gradle-cache/caches/*/fileHashes/fileHashes.bin
-  - rm -f  .gradle-cache/caches/*/fileHashes/fileHashes.lock
+  - rm -f  .batect/caches/gradle-cache/caches/modules-2/modules-2.lock
+  - rm -fr .batect/caches/gradle-cache/caches/*/plugin-resolution/
+  - rm -f  .batect/caches/gradle-cache/caches/*/fileHashes/fileHashes.bin
+  - rm -f  .batect/caches/gradle-cache/caches/*/fileHashes/fileHashes.lock
+  - rm -f  .batect/caches/gradle-cache/caches/*/javaCompile/javaCompile.lock
 
 cache:
   directories:
-    - .gradle-cache/caches/
-    - .gradle-cache/wrapper/
+    - .batect/caches
diff --git a/batect b/batect
@@ -8,7 +8,7 @@
     # You should commit this file to version control alongside the rest of your project. It should not be installed globally.
     # For more information, visit https://github.com/batect/batect.
 
-    VERSION="0.47.0"
+    VERSION="0.50.0"
     DOWNLOAD_URL_ROOT=${BATECT_DOWNLOAD_URL_ROOT:-"https://dl.bintray.com/batect/batect"}
     DOWNLOAD_URL=${BATECT_DOWNLOAD_URL:-"$DOWNLOAD_URL_ROOT/$VERSION/bin/batect-$VERSION.jar"}
     QUIET_DOWNLOAD=${BATECT_QUIET_DOWNLOAD:-false}
@@ -61,6 +61,7 @@
 
         BATECT_WRAPPER_SCRIPT_DIR="$SCRIPT_PATH" \
         HOSTNAME="$HOSTNAME" \
+        exec \
             java \
             -Djava.net.useSystemProxies=true \
             $JAVA_OPTS \

diff --git a/batect.cmd b/batect.cmd
@@ -6,7 +6,7 @@ rem For more information, visit https://github.com/batect/batect.
 
 setlocal EnableDelayedExpansion
 
-set "version=0.47.0"
+set "version=0.50.0"
 
 if "%BATECT_CACHE_DIR%" == "" (
     set "BATECT_CACHE_DIR=%USERPROFILE%\.batect\cache"
@@ -22,7 +22,7 @@ $ErrorActionPreference = 'Stop'^
 
 ^
 
-$Version='0.47.0'^
+$Version='0.50.0'^
 
 ^
 

diff --git a/batect.yml b/batect.yml
@@ -7,9 +7,9 @@ containers:
       - local: .
         container: /code
         options: cached
-      - local: .gradle-cache
+      - type: cache
+        name: gradle-cache
         container: /home/container-user/.gradle
-        options: cached
     working_directory: /code
     environment:
       GRADLE_OPTS: -Dorg.gradle.daemon=false