Merge pull request #8475 from nextcloud/android61

Use JDK11 and Gradle 6.7.1 in Android container

.drone.yml

@@ -5,7 +5,7 @@ name: tests-stable
 
 steps:
   - name: gplay
-    image: nextcloudci/android8:android-60
+    image: nextcloudci/android8:android-61
     privileged: true
     environment:
       LOG_USERNAME:
@@ -87,7 +87,7 @@ name: tests-master
 
 steps:
   - name: gplay
-    image: nextcloudci/android8:android-60
+    image: nextcloudci/android8:android-61
     privileged: true
     environment:
       LOG_USERNAME:
@@ -170,7 +170,7 @@ name: analysis
 
 steps:
   - name: analysis
-    image: nextcloudci/android8:android-60
+    image: nextcloudci/android8:android-61
     environment:
       GIT_USERNAME:
         from_secret: GIT_USERNAME

.github/workflows/assembleFlavors.yml

@@ -10,15 +10,14 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                java_version: [ 8, 11 ]
                 flavor: [ Generic, Gplay ]
         steps:
             -   uses: actions/checkout@v2
-            -   name: set up JDK ${{ matrix.java_version }}
+            -   name: set up JDK 11
                 uses: actions/setup-java@v2
                 with:
                     distribution: "adopt"
-                    java-version: ${{ matrix.java_version }}
+                    java-version: 11
             -   name: Build ${{ matrix.flavor }}
                 run: |
                     echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" >> gradle.properties

scripts/uploadReport.sh

@@ -58,7 +58,7 @@ if [ -z $USER ] || [ -z $PASS ]; then
 fi
 
 if [ $TYPE = "IT" ]; then
-    FOLDER=build/reports/androidTests/connected/flavors/GPLAY
+    FOLDER=build/reports/androidTests/connected/flavors/gplay
 elif [ $TYPE = "Unit" ]; then
     FOLDER=build/reports/tests/testGplayDebugUnitTest
 else