Merge pull request 'flutter3.7.1' (#626) from flutter3.7.1 into trunk

Reviewed-on: #626

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
   - name: clone
-    image: cirrusci/flutter:3.3.8
+    image: openpriv/flutter-desktop:linux-fstable-3.7.1
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -24,7 +24,7 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
-    image: cirrusci/flutter:3.3.8
+    image: openpriv/flutter-desktop:linux-fstable-3.7.1
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -47,7 +47,7 @@ steps:
   #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
 
   - name: build-linux
-    image: openpriv/flutter-desktop:linux-fstable-3.3.9
+    image: openpriv/flutter-desktop:linux-fstable-3.7.1
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -61,19 +61,16 @@ steps:
       - rm -r cwtch
 
   - name: linux-ui-tests
-    image: openpriv/flutter-desktop:linux-fstable-3.3.9
+    image: openpriv/flutter-desktop:linux-fstable-3.7.1
     volumes:
       - name: deps
         path: /root/.pub-cache
     commands:
-      - # todo: add xvfb to openpriv/flutter-desktop:linux-fstable-3.7
-      - sudo apt update
-      - sudo apt-get install -y xvfb
       - ./fetch-tor.sh
-      - ./run-tests-headless.sh 02_save_load
+      - ./run-tests-headless.sh 01_general
 
   - name: test-build-android
-    image: cirrusci/flutter:3.3.8
+    image: openpriv/flutter-desktop:linux-fstable-3.7.1
     when:
       event: pull_request
     volumes:
@@ -83,7 +80,7 @@ steps:
       - flutter build apk --debug
 
   - name: build-android
-    image: cirrusci/flutter:3.3.8
+    image: openpriv/flutter-desktop:linux-fstable-3.7.1
     when:
       event: push
     environment:
@@ -107,7 +104,7 @@ steps:
       #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android
 
   - name: widget-tests
-    image: cirrusci/flutter:3.3.8
+    image:  openpriv/flutter-desktop:linux-fstable-3.7.1
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -189,7 +186,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.7.1
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -207,7 +204,7 @@ steps:
       - git checkout $Env:DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.7.1
     commands:
       - git describe --tags --abbrev=1 > VERSION
       - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE
@@ -215,7 +212,7 @@ steps:
       - .\fetch-libcwtch-go.ps1
 
   - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.7.1
     commands:
       - flutter pub get
       - $Env:version += type .\VERSION
@@ -274,7 +271,7 @@ steps:
       - move *.sha512 deploy\$Env:builddir
 
   - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.7.1
     when:
       event: push
       status: [ success ]

android/app/build.gradle

@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -42,6 +42,12 @@ android {
 
     lintOptions {
         disable 'InvalidPackage'
+
+        // For some reason we get  Error: LottieAnimationView must extend android.view.View
+        // Given the newer gradle build...I'm not sure why, but it does impact functionality at all
+        // there is no information about this error and the command output suggests including the
+        // following:
+        abortOnError false
     }
 
     defaultConfig {
@@ -91,7 +97,7 @@ dependencies {
     implementation project(':cwtch')
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
-    implementation "com.airbnb.android:lottie:4.2.1"
+    implementation "com.airbnb.android:lottie:5.2.0"
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
     implementation "com.android.support.constraint:constraint-layout:2.0.4"
 
@@ -129,5 +135,5 @@ dependencies {
 
     // needed to prevent a ListenableFuture dependency conflict/bug
     // see https://github.com/google/ExoPlayer/issues/7905#issuecomment-692637059
-    implementation 'com.google.guava:guava:any'
+    implementation "com.google.guava:guava:31.0.1-android"
 }

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.31'
+    ext.kotlin_version = '1.6.21'
     repositories {
         google()
         // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,7 +7,7 @@ import Foundation
 
 import flutter_local_notifications
 import package_info_plus_macos
-import path_provider_macos
+import path_provider_foundation
 import screen_retriever
 import url_launcher_macos
 import window_manager

pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.10.0+36
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   flutter: