Merge 2610e6aff6 into fd97fc7fef

.github/workflows/build_apk.yml

@@ -90,7 +90,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
-          java-version: "11"
+          java-version: "17"
 
       - name: Restore Android keystore .jsk and .properties files
         run: |
@@ -112,6 +112,7 @@ jobs:
         run: bash ./.github/scripts/increment_build_number.sh ${{ github.event.inputs.version }}
 
       - name: Download release notes
+        continue-on-error: true
         uses: actions/download-artifact@v3
         with:
           name: ${{ env.RELEASE_NOTES_ARTIFACT_NAME }}

.github/workflows/build_ipa.yml

@@ -45,7 +45,7 @@ env:
 jobs:
   build:
     name: Build .ipa
-    runs-on: macos-13
+    runs-on: macos-latest
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
@@ -107,6 +107,7 @@ jobs:
         run: bash ./.github/scripts/increment_build_number.sh ${{ github.event.inputs.version }}
 
       - name: Download release notes
+        continue-on-error: true
         uses: actions/download-artifact@v3
         with:
           name: ${{ env.RELEASE_NOTES_ARTIFACT_NAME }}
@@ -123,6 +124,7 @@ jobs:
           flutter --version
           flutter pub get
           flutter pub run intl_utils:generate
+          dart pub global activate flutterfire_cli
 
       - name: Build .ipa
         run: |

.github/workflows/run_integration_tests.yml

@@ -39,6 +39,7 @@ jobs:
           flutter pub get
           flutter pub run intl_utils:generate
           flutter analyze lib --fatal-infos
+          dart pub global activate flutterfire_cli
 
       - name: Launch iOS simulator
         uses: futureware-tech/simulator-action@v3

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "task.slowProviderWarning": true,
-  "dart.flutterSdkPath": ".fvm/versions/3.27.1",
+  "dart.flutterSdkPath": ".fvm/flutter_sdk",
   "search.exclude": {
     "**/.fvm": true
   },

iap/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
     git:
       url: "https://github.com/vodemn/m3_lightmeter_resources"
       ref: v2.1.0
-  shared_preferences: 2.2.0
+  shared_preferences:
 
 dev_dependencies:
   flutter_test:

pubspec.lock

@@ -728,10 +728,10 @@ packages:
     dependency: transitive
     description:
       name: in_app_purchase_storekit
-      sha256: "250b3865da1f4abf0d0e1eda9556734ee22ab5ebfe47a59227d8d9aeaa1c03e8"
+      sha256: "52caf1051fec8018adabd2d1e775a44cb389972ed868a746c4fc28a301734d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.20+2"
+    version: "0.3.20+4"
   integration_test:
     dependency: "direct dev"
     description: flutter