Skip to content

Commit 817db6e

Browse files
authored
Merge branch 'develop' into develop
2 parents ef7a6db + 08e671d commit 817db6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+463
-456
lines changed

.github/workflows/build.yaml

Lines changed: 71 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ name: build
44
# events but only for the develop branch
55
on:
66
push:
7-
branches: [ develop, master ]
7+
branches: [develop, main]
88
paths:
9-
- 'flutter_cache_manager/**'
9+
- "flutter_cache_manager/**"
10+
- ".github/workflows/**"
1011
pull_request:
11-
branches: [ develop ]
12+
branches: [develop]
1213
paths:
13-
- 'flutter_cache_manager/**'
14+
- "flutter_cache_manager/**"
15+
- ".github/workflows/**"
1416

1517
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1618
jobs:
@@ -26,12 +28,15 @@ jobs:
2628
# Steps represent a sequence of tasks that will be executed as part of the job
2729
steps:
2830
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
29-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3032

3133
# Make sure the stable version of Flutter is available
32-
- uses: subosito/flutter-action@v2
34+
- name: Set up Flutter
35+
uses: subosito/flutter-action@v2
3336
with:
34-
channel: 'stable'
37+
channel: "stable"
38+
architecture: x64
39+
cache: true
3540

3641
# Download all Flutter packages
3742
- name: Download dependencies
@@ -55,12 +60,15 @@ jobs:
5560
# Steps represent a sequence of tasks that will be executed as part of the job
5661
steps:
5762
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
58-
- uses: actions/checkout@v3
63+
- uses: actions/checkout@v4
5964

6065
# Make sure the stable version of Flutter is available
61-
- uses: subosito/flutter-action@v2
66+
- name: Set up Flutter
67+
uses: subosito/flutter-action@v2
6268
with:
63-
channel: 'stable'
69+
channel: "stable"
70+
architecture: x64
71+
cache: true
6472

6573
# Download all Flutter packages
6674
- name: Download dependencies
@@ -85,18 +93,21 @@ jobs:
8593
# Steps represent a sequence of tasks that will be executed as part of the job
8694
steps:
8795
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
88-
- uses: actions/checkout@v3
96+
- uses: actions/checkout@v4
8997

9098
# Ensure correct JAVA version is installed.
91-
- uses: actions/setup-java@v3
99+
- uses: actions/setup-java@v4
92100
with:
93-
distribution: 'zulu'
94-
java-version: '17'
101+
distribution: "zulu"
102+
java-version: "17"
95103

96104
# Make sure the stable version of Flutter is available
97-
- uses: subosito/flutter-action@v2
105+
- name: Set up Flutter
106+
uses: subosito/flutter-action@v2
98107
with:
99-
channel: 'stable'
108+
channel: "stable"
109+
architecture: x64
110+
cache: true
100111

101112
# Download all Flutter packages
102113
- name: Download dependencies
@@ -121,12 +132,15 @@ jobs:
121132
# Steps represent a sequence of tasks that will be executed as part of the job
122133
steps:
123134
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
124-
- uses: actions/checkout@v3
135+
- uses: actions/checkout@v4
125136

126137
# Make sure the stable version of Flutter is available
127-
- uses: subosito/flutter-action@v2
138+
- name: Set up Flutter
139+
uses: subosito/flutter-action@v2
128140
with:
129-
channel: 'stable'
141+
channel: "stable"
142+
architecture: x64
143+
cache: true
130144

131145
# Download all Flutter packages
132146
- name: Download dependencies
@@ -151,12 +165,15 @@ jobs:
151165
# Steps represent a sequence of tasks that will be executed as part of the job
152166
steps:
153167
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
154-
- uses: actions/checkout@v3
168+
- uses: actions/checkout@v4
155169

156170
# Make sure the stable version of Flutter is available
157-
- uses: subosito/flutter-action@v2
171+
- name: Set up Flutter
172+
uses: subosito/flutter-action@v2
158173
with:
159-
channel: 'stable'
174+
channel: "stable"
175+
architecture: x64
176+
cache: true
160177

161178
# Enable platform support
162179
- name: Enable macOS
@@ -186,12 +203,15 @@ jobs:
186203
# Steps represent a sequence of tasks that will be executed as part of the job
187204
steps:
188205
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
189-
- uses: actions/checkout@v3
206+
- uses: actions/checkout@v4
190207

191208
# Make sure the stable version of Flutter is available
192-
- uses: subosito/flutter-action@v2
209+
- name: Set up Flutter
210+
uses: subosito/flutter-action@v2
193211
with:
194-
channel: 'stable'
212+
channel: "stable"
213+
architecture: x64
214+
cache: true
195215

196216
# Enable platform support
197217
- name: Enable Windows
@@ -225,12 +245,15 @@ jobs:
225245
- run: sudo apt-get install -y ninja-build libgtk-3-dev libblkid-dev
226246

227247
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
228-
- uses: actions/checkout@v3
248+
- uses: actions/checkout@v4
229249

230250
# Make sure the stable version of Flutter is available
231-
- uses: subosito/flutter-action@v2
251+
- name: Set up Flutter
252+
uses: subosito/flutter-action@v2
232253
with:
233-
channel: 'stable'
254+
channel: "stable"
255+
architecture: x64
256+
cache: true
234257

235258
# Enable platform support
236259
- name: Enable Linux
@@ -265,12 +288,15 @@ jobs:
265288
# Steps represent a sequence of tasks that will be executed as part of the job
266289
steps:
267290
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
268-
- uses: actions/checkout@v3
291+
- uses: actions/checkout@v4
269292

270293
# Make sure the stable version of Flutter is available
271-
- uses: subosito/flutter-action@v2
294+
- name: Set up Flutter
295+
uses: subosito/flutter-action@v2
272296
with:
273-
channel: 'stable'
297+
channel: "stable"
298+
architecture: x64
299+
cache: true
274300

275301
# Download all Flutter packages
276302
- name: Download dependencies
@@ -293,12 +319,15 @@ jobs:
293319
# Steps represent a sequence of tasks that will be executed as part of the job
294320
steps:
295321
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
296-
- uses: actions/checkout@v3
322+
- uses: actions/checkout@v4
297323

298324
# Make sure the stable version of Flutter is available
299-
- uses: subosito/flutter-action@v2
325+
- name: Set up Flutter
326+
uses: subosito/flutter-action@v2
300327
with:
301-
channel: 'stable'
328+
channel: "stable"
329+
architecture: x64
330+
cache: true
302331

303332
# Download all Flutter packages
304333
- name: Download dependencies
@@ -310,9 +339,11 @@ jobs:
310339
run: flutter test --coverage
311340
working-directory: ${{env.source-directory}}
312341

313-
# Upload code coverage information
314-
- uses: codecov/codecov-action@v3
315-
with:
316-
files: ${{env.source-directory}}/coverage/lcov.info
317-
name: CacheManager
318-
fail_ci_if_error: true
342+
# # Upload code coverage information
343+
# - uses: codecov/codecov-action@v4
344+
# env:
345+
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
346+
# with:
347+
# files: ${{env.source-directory}}/coverage/lcov.info
348+
# name: CacheManager
349+
# fail_ci_if_error: true

.gitignore

Lines changed: 68 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,53 @@
88
.atom/
99
.buildlog/
1010
.history
11-
.project
1211
.svn/
13-
bin/
12+
devtools_options.yaml
13+
14+
# Environment files
15+
ios/Flutter/Dart-Defines.xcconfig
1416

1517
# IntelliJ related
1618
*.iml
1719
*.ipr
1820
*.iws
1921
.idea/
2022

21-
# Android Studio related
22-
android/.classpath
23-
android/.settings/
24-
2523
# Visual Studio Code related
26-
.vscode/
27-
28-
# Flutter repo-specific
29-
/bin/cache/
30-
/bin/mingit/
31-
/dev/benchmarks/mega_gallery/
32-
/dev/bots/.recipe_deps
33-
/dev/bots/android_tools/
34-
/dev/docs/doc/
35-
/dev/docs/lib/
36-
/dev/docs/pubspec.yaml
37-
/packages/flutter/coverage/
38-
version
24+
.classpath
25+
.project
26+
.settings/
27+
.vscode/*
28+
29+
# packages file containing multi-root paths
30+
.packages.generated
3931

4032
# Flutter/Dart/Pub related
4133
**/doc/api/
4234
.dart_tool/
4335
.flutter-plugins
36+
.flutter-plugins-dependencies
37+
**/generated_plugin_registrant.dart
4438
.packages
39+
.pub-preload-cache/
4540
.pub-cache/
4641
.pub/
4742
build/
4843
flutter_*.png
4944
linked_*.ds
5045
unlinked.ds
5146
unlinked_spec.ds
52-
flutter_export_environment.sh
5347

5448
# Android related
5549
**/android/**/gradle-wrapper.jar
56-
**/android/.gradle
50+
.gradle/
5751
**/android/captures/
5852
**/android/gradlew
5953
**/android/gradlew.bat
6054
**/android/local.properties
6155
**/android/**/GeneratedPluginRegistrant.java
56+
**/android/key.properties
57+
*.jks
6258

6359
# iOS/XCode related
6460
**/ios/**/*.mode1v3
@@ -77,20 +73,69 @@ flutter_export_environment.sh
7773
**/ios/**/profile
7874
**/ios/**/xcuserdata
7975
**/ios/.generated/
76+
**/ios/Flutter/.last_build_id
8077
**/ios/Flutter/App.framework
8178
**/ios/Flutter/Flutter.framework
79+
**/ios/Flutter/Flutter.podspec
8280
**/ios/Flutter/Generated.xcconfig
81+
**/ios/Flutter/ephemeral
8382
**/ios/Flutter/app.flx
8483
**/ios/Flutter/app.zip
8584
**/ios/Flutter/flutter_assets/
85+
**/ios/Flutter/flutter_export_environment.sh
8686
**/ios/ServiceDefinitions.json
8787
**/ios/Runner/GeneratedPluginRegistrant.*
8888

89+
# macOS
90+
**/Flutter/ephemeral/
91+
**/Pods/
92+
**/macos/Flutter/GeneratedPluginRegistrant.swift
93+
**/macos/Flutter/ephemeral
94+
**/xcuserdata/
95+
96+
# Windows
97+
**/windows/flutter/generated_plugin_registrant.cc
98+
**/windows/flutter/generated_plugin_registrant.h
99+
**/windows/flutter/generated_plugins.cmake
100+
101+
# Linux
102+
**/linux/flutter/generated_plugin_registrant.cc
103+
**/linux/flutter/generated_plugin_registrant.h
104+
**/linux/flutter/generated_plugins.cmake
105+
106+
# Coverage
107+
coverage/
108+
109+
# Submodules
110+
packages/**/pubspec.lock
111+
112+
# Web related
113+
lib/generated_plugin_registrant.dart
114+
115+
# Symbols
116+
app.*.symbols
117+
118+
# Obfuscation related
119+
app.*.map.json
120+
89121
# Exceptions to above rules.
90122
!**/ios/**/default.mode1v3
91123
!**/ios/**/default.mode2v3
92124
!**/ios/**/default.pbxuser
93125
!**/ios/**/default.perspectivev3
94126
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
95-
example/.flutter-plugins-dependencies
96-
flutter_cache_manager/example/ios/Flutter/.last_build_id
127+
!/dev/ci/**/Gemfile.lock
128+
!.vscode/settings.json
129+
!.vscode/tasks.json
130+
!.vscode/launch.json
131+
!.vscode/extensions.json
132+
!.idea/codeStyles/
133+
!.idea/dictionaries/
134+
!.idea/runConfigurations/
135+
136+
# Generated files
137+
**/generated
138+
*.g.dart
139+
140+
# Injection generated files
141+
injectable.config.dart

flutter_cache_manager/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## [3.3.3] - 2024-07-23
2+
* Updates dependencies ([#457](https://github.com/Baseflow/flutter_cache_manager/pull/457))
3+
14
## [3.3.2] - 2024-04-25
25
* Updates dependencies to their latest versions.
36

0 commit comments

Comments
 (0)