Merge branch 'master' into dev_alpha03

Author: nickbutcher

.github/workflows/Crane.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project
@@ -84,9 +84,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Run instrumentation tests
@@ -104,4 +104,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-reports
-          path: ${{ env.SAMPLE_PATH }}/app/build/reports
+          path: ${{ env.SAMPLE_PATH }}/app/build/reports

.github/workflows/JetNews.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project
@@ -84,9 +84,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Run instrumentation tests
@@ -103,4 +103,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-reports
-          path: ${{ env.SAMPLE_PATH }}/app/build/reports
+          path: ${{ env.SAMPLE_PATH }}/app/build/reports

.github/workflows/Jetcaster.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project

.github/workflows/Jetchat.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project
@@ -84,9 +84,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Run instrumentation tests
@@ -103,4 +103,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: test-reports
-          path: ${{ env.SAMPLE_PATH }}/app/build/reports
+          path: ${{ env.SAMPLE_PATH }}/app/build/reports

.github/workflows/Jetsnack.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project

.github/workflows/Jetsurvey.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project

.github/workflows/Owl.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project

.github/workflows/Rally.yaml

@@ -36,9 +36,9 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.gradle/caches/modules-2
-            ~/.gradle/caches/jars-3
-            ~/.gradle/caches/build-cache-1
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
           key: gradle-${{ hashFiles('checksum.txt') }}
 
       - name: Build project