Merge PR #2058

Author: AdamVe

.github/workflows/android.yml

@@ -13,7 +13,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: 'app'
 
@@ -69,7 +69,7 @@ jobs:
         run: android/scripts/collect-artifacts.sh ${GITHUB_REF}
         working-directory: ./app
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: yubico-authenticator-android
           path: app/artifacts/*

.github/workflows/check-strings.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Read variables from repo
       run: cat .github/workflows/env >> $GITHUB_ENV

.github/workflows/codeql-analysis.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           setup-python-dependencies: false
@@ -39,7 +39,7 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: 'app'
 
@@ -81,7 +81,7 @@ jobs:
 
       - if: matrix.language == 'python'
         name: autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/env

@@ -1,2 +1,2 @@
-FLUTTER=3.35.3
-PYVER=3.13.8
+FLUTTER=3.38.5
+PYVER=3.14.2

.github/workflows/linux-arm64.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04-arm
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         sparse-checkout: .github/workflows/env
 
@@ -44,21 +44,21 @@ jobs:
         echo "Expected: $PYVER"
         exit 1
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Check app versions
       run: |
         python3 set-version.py
         git diff --exit-code
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
 
     - name: Cache helper
       id: cache-helper
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           build/linux/helper
@@ -128,7 +128,7 @@ jobs:
         tar -czf deploy/${BASENAME}.tar.gz -C build "${BASENAME}"
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: yubioath-desktop-linux-arm64
         path: deploy

.github/workflows/linux.yml

@@ -12,7 +12,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         sparse-checkout: .github/workflows/env
 
@@ -30,10 +30,10 @@ jobs:
         apt-get install -qq git
         git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
 
@@ -48,7 +48,7 @@ jobs:
 
     - name: Cache helper
       id: cache-helper
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           build/linux/helper
@@ -58,7 +58,11 @@ jobs:
     - name: Build the Helper
       if: steps.cache-helper.outputs.cache-hit != 'true'
       run: |
-        apt-get install -qq swig libpcsclite-dev build-essential cmake
+        add-apt-repository ppa:ubuntu-toolchain-r/test -y
+        apt update -y
+        apt-get install -qq swig libpcsclite-dev build-essential cmake gcc-13 g++-13
+        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 60 --slave /usr/bin/g++ g++ /usr/bin/g++-13 
+        update-alternatives --config gcc
         ./build-helper.sh
 
     - name: Install Flutter dependencies
@@ -111,7 +115,7 @@ jobs:
         tar -czf deploy/${BASENAME}.tar.gz -C build "${BASENAME}"
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: yubioath-desktop-linux
         path: deploy

.github/workflows/macos.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Read variables from repo
       run: |
@@ -32,13 +32,13 @@ jobs:
         podfile-path: macos/Podfile.lock
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v6
+      uses: astral-sh/setup-uv@v7
       with:
         enable-cache: true
 
     - name: Cache helper
       id: cache-helper
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: |
           build/macos/helper
@@ -102,7 +102,7 @@ jobs:
         mv macos/release-macos.sh deploy
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: yubioath-desktop-macos
         path: deploy

.github/workflows/windows.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Read variables from repo
         shell: bash
@@ -29,13 +29,13 @@ jobs:
         run: python -m pip install --upgrade pip
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
 
       - name: Cache helper
         id: cache-helper
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             build/windows/helper
@@ -88,7 +88,7 @@ jobs:
           mv resources deploy
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: yubioath-desktop-windows
           path: deploy
@@ -108,10 +108,10 @@ jobs:
         fi
 
     - name: checkout repo
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: download artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
       with:
         path: yubioath-desktop-windows
 
@@ -156,7 +156,7 @@ jobs:
         cp signed/authenticator.exe yubioath-desktop-windows/*/authenticator.exe
 
     - name: upload signed artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: signed-files
         path: yubioath-desktop-windows
@@ -178,10 +178,10 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Download /signed dir
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
 
       - name: Read variables from repo
         shell: bash
@@ -206,7 +206,7 @@ jobs:
           mv yubioath-desktop.msi installer
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: installer
           path: installer
@@ -226,10 +226,10 @@ jobs:
         fi
 
     - name: checkout repo
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: download artifacts
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v7
 
     - name: docker login
       uses: docker/login-action@v3
@@ -291,7 +291,7 @@ jobs:
         rm 1.zip
 
     - name: upload signed artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: signed-installer
         path: signed/*

android/app/build.gradle

@@ -26,7 +26,7 @@ if (flutterVersionName == null) {
 
 android {
 
-    namespace 'com.yubico.authenticator'
+    namespace = 'com.yubico.authenticator'
 
     compileSdkVersion project.compileSdkVersion
 
@@ -53,21 +53,21 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled = true
+            shrinkResources = true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
             applicationIdSuffix ".debug"
         }
     }
 
     buildFeatures {
-        buildConfig true
+        buildConfig = true
     }
 
     lint {
-        abortOnError false
+        abortOnError = false
     }
 
     applicationVariants.all { variant ->
@@ -84,13 +84,14 @@ android {
         exclude 'META-INF/versions/9/OSGI-INF/bcpkix.provider.bc.Licenses'
     }
 
+    ndkVersion = flutter.ndkVersion
 }
 
 apply from: "signing.gradle"
 apply from: "collect_licenses.gradle"
 
 flutter {
-    source '../..'
+    source = '../..'
 }
 
 dependencies {
@@ -105,7 +106,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
 
     // Lifecycle
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
 
     implementation "androidx.core:core-ktx:1.17.0"
     implementation 'androidx.fragment:fragment-ktx:1.8.9'
@@ -115,11 +116,20 @@ dependencies {
 
     implementation 'com.github.tony19:logback-android:3.0.0'
 
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.81'
-    implementation 'org.bouncycastle:bcpkix-jdk18on:1.81'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.83'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.83'
 
     // testing dependencies
     testImplementation "junit:junit:$project.junitVersion"
     testImplementation "org.mockito:mockito-core:$project.mockitoVersion"
-    testImplementation 'android.arch.core:core-testing:1.1.1'
+    testImplementation 'androidx.arch.core:core-testing:2.2.0'
 }
+
+// disable OssLicensesTask during testing
+gradle.taskGraph.whenReady { taskGraph ->
+    if (taskGraph.hasTask(":app:test") || taskGraph.allTasks.any { it.name.contains("Test") }) {
+        tasks.matching { it.name.contains("OssLicensesTask") }.configureEach { task ->
+            task.enabled = false
+        }
+    }
+}

android/app/collect_licenses.gradle

@@ -61,7 +61,7 @@ def collectLicenses(File rootDir, File ossPluginResDir, File outDir) {
 
     // add zxing_licenses which are not detected
     println "adding zxing licenses"
-    licenseList.add(PackageName: "ZXing Core (3.5.2)", PackageLicense: "https://www.apache.org/licenses/LICENSE-2.0.txt")
+    licenseList.add(PackageName: "ZXing Core (3.5.4)", PackageLicense: "https://www.apache.org/licenses/LICENSE-2.0.txt")
     licenseList.add(PackageName: "ZXing Android Core (3.3.0)", PackageLicense: "https://www.apache.org/licenses/LICENSE-2.0.txt")
 
     outFile.write(new JsonOutput().toJson(licenseList))
@@ -85,7 +85,7 @@ def collectLicenses(File rootDir, File ossPluginResDir, File outDir) {
 tasks.register('collectLicenses') {
     dependsOn(":app:releaseOssLicensesTask")
     doLast {
-        def ossPluginResDir = new File(project.buildDir, "generated/third_party_licenses/release/res/raw/")
+        def ossPluginResDir = new File(project.buildDir, "generated/res/releaseOssLicensesTask/raw/")
         collectLicenses(project.rootDir, ossPluginResDir, new File(project.rootDir.parent, "assets/licenses/raw/"))
     }
 }