add missing changes from #8781

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Co-Authored-by: tobiasKaminsky <tobias@kaminsky.me>

.github/workflows/check.yml

@@ -14,8 +14,9 @@ jobs:
         steps:
             -   uses: actions/checkout@v2
             -   name: Set up JDK 11
-                uses: actions/setup-java@v1
+                uses: actions/setup-java@v2
                 with:
+                    distribution: "adopt"
                     java-version: 11
             -   name: Check ${{ matrix.task }}
                 run: ./gradlew ${{ matrix.task }}

.github/workflows/qa.yml

@@ -15,8 +15,9 @@ jobs:
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
             -   name: set up JDK 11
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
-                uses: actions/setup-java@v1
+                uses: actions/setup-java@v2
                 with:
+                    distribution: "adopt"
                     java-version: 11
             -   name: Build QA
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}

.github/workflows/screenShotTest.yml

@@ -15,8 +15,9 @@ jobs:
         steps:
             -   uses: actions/checkout@v2
             -   name: set up JDK 11
-                uses: actions/setup-java@v1
+                uses: actions/setup-java@v2
                 with:
+                    distribution: "adopt"
                     java-version: 11
             -   name: Build gplay
                 run: |

build.gradle

@@ -70,9 +70,6 @@ ext {
     fidoVersion = "4.1.0"
 
     ciBuild = System.getenv("CI") == "true"
-
-    // allows for -D pre-dex=false to be set
-    preDexEnabled = "true" == System.getProperty("pre-dex", "true")
 }
 
 repositories {
@@ -100,8 +97,6 @@ for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()
     }
 }
 
-
-
 android {
     lintOptions {
         checkGeneratedSources = true
@@ -190,11 +185,6 @@ android {
     // adapt structure from Eclipse to Gradle/Android Studio expectations;
     // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
 
-    dexOptions {
-        // Skip pre-dexing when running on CI or when disabled via -D pre-dex=false.
-        preDexLibraries = preDexEnabled && !ciBuild
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/LICENSE'