Merge branch 'develop' into develop

Baseflow · Jul 31, 2024 · 817db6e · 817db6e
2 parents ef7a6db + 08e671d
commit 817db6e
Show file tree

Hide file tree

Showing 50 changed files with 463 additions and 456 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,13 +4,15 @@ name: build
 # events but only for the develop branch
 on:
   push:
-    branches: [ develop, master ]
+    branches: [develop, main]
     paths:
-      - 'flutter_cache_manager/**'
+      - "flutter_cache_manager/**"
+      - ".github/workflows/**"
   pull_request:
-    branches: [ develop ]
+    branches: [develop]
     paths:
-      - 'flutter_cache_manager/**'
+      - "flutter_cache_manager/**"
+      - ".github/workflows/**"
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -26,12 +28,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Download all Flutter packages
       - name: Download dependencies
@@ -55,12 +60,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Download all Flutter packages
       - name: Download dependencies
@@ -85,18 +93,21 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Ensure correct JAVA version is installed.
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: '17'
+          distribution: "zulu"
+          java-version: "17"
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Download all Flutter packages
       - name: Download dependencies
@@ -121,12 +132,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Download all Flutter packages
       - name: Download dependencies
@@ -151,12 +165,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Enable platform support
       - name: Enable macOS
@@ -186,12 +203,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Enable platform support
       - name: Enable Windows
@@ -225,12 +245,15 @@ jobs:
       - run: sudo apt-get install -y ninja-build libgtk-3-dev libblkid-dev
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Enable platform support
       - name: Enable Linux
@@ -265,12 +288,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Download all Flutter packages
       - name: Download dependencies
@@ -293,12 +319,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v2
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          channel: 'stable'
+          channel: "stable"
+          architecture: x64
+          cache: true
 
       # Download all Flutter packages
       - name: Download dependencies
@@ -310,9 +339,11 @@ jobs:
         run: flutter test --coverage
         working-directory: ${{env.source-directory}}
 
-      # Upload code coverage information
-      - uses: codecov/codecov-action@v3
-        with:
-          files: ${{env.source-directory}}/coverage/lcov.info
-          name: CacheManager
-          fail_ci_if_error: true
+      # # Upload code coverage information
+      # - uses: codecov/codecov-action@v4
+      #   env:
+      #      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      #   with:
+      #     files: ${{env.source-directory}}/coverage/lcov.info
+      #     name: CacheManager
+      #     fail_ci_if_error: true
diff --git a/.gitignore b/.gitignore
@@ -8,57 +8,53 @@
 .atom/
 .buildlog/
 .history
-.project
 .svn/
-bin/
+devtools_options.yaml
+
+# Environment files
+ios/Flutter/Dart-Defines.xcconfig
 
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
 .idea/
 
-# Android Studio related
-android/.classpath
-android/.settings/
-
 # Visual Studio Code related
-.vscode/
-
-# Flutter repo-specific
-/bin/cache/
-/bin/mingit/
-/dev/benchmarks/mega_gallery/
-/dev/bots/.recipe_deps
-/dev/bots/android_tools/
-/dev/docs/doc/
-/dev/docs/lib/
-/dev/docs/pubspec.yaml
-/packages/flutter/coverage/
-version
+.classpath
+.project
+.settings/
+.vscode/*
+
+# packages file containing multi-root paths
+.packages.generated
 
 # Flutter/Dart/Pub related
 **/doc/api/
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
+**/generated_plugin_registrant.dart
 .packages
+.pub-preload-cache/
 .pub-cache/
 .pub/
 build/
 flutter_*.png
 linked_*.ds
 unlinked.ds
 unlinked_spec.ds
-flutter_export_environment.sh
 
 # Android related
 **/android/**/gradle-wrapper.jar
-**/android/.gradle
+.gradle/
 **/android/captures/
 **/android/gradlew
 **/android/gradlew.bat
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
 
 # iOS/XCode related
 **/ios/**/*.mode1v3
@@ -77,20 +73,69 @@ flutter_export_environment.sh
 **/ios/**/profile
 **/ios/**/xcuserdata
 **/ios/.generated/
+**/ios/Flutter/.last_build_id
 **/ios/Flutter/App.framework
 **/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
 **/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/ephemeral
 **/ios/Flutter/app.flx
 **/ios/Flutter/app.zip
 **/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
 
+# macOS
+**/Flutter/ephemeral/
+**/Pods/
+**/macos/Flutter/GeneratedPluginRegistrant.swift
+**/macos/Flutter/ephemeral
+**/xcuserdata/
+
+# Windows
+**/windows/flutter/generated_plugin_registrant.cc
+**/windows/flutter/generated_plugin_registrant.h
+**/windows/flutter/generated_plugins.cmake
+
+# Linux
+**/linux/flutter/generated_plugin_registrant.cc
+**/linux/flutter/generated_plugin_registrant.h
+**/linux/flutter/generated_plugins.cmake
+
+# Coverage
+coverage/
+
+# Submodules
+packages/**/pubspec.lock
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbols
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-example/.flutter-plugins-dependencies
-flutter_cache_manager/example/ios/Flutter/.last_build_id
+!/dev/ci/**/Gemfile.lock
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.idea/codeStyles/
+!.idea/dictionaries/
+!.idea/runConfigurations/
+
+# Generated files
+**/generated
+*.g.dart
+
+# Injection generated files
+injectable.config.dart
diff --git a/flutter_cache_manager/CHANGELOG.md b/flutter_cache_manager/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [3.3.3] - 2024-07-23
+* Updates dependencies ([#457](https://github.com/Baseflow/flutter_cache_manager/pull/457))
+
 ## [3.3.2] - 2024-04-25
 * Updates dependencies to their latest versions.