Skip to content

Commit c5f6271

Browse files
tristan-vrttristan-vrt
committed
Merge remote-tracking branch 'upstream/develop' into feature/allow-extend-info-repository
# Conflicts: # flutter_cache_manager/example/pubspec.yaml
2 parents d44294e + 32b71c1 commit c5f6271

File tree

121 files changed

+1597
-919
lines changed

Some content is hidden

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

121 files changed

+1597
-919
lines changed

‎.github/workflows/build.yaml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
# Steps represent a sequence of tasks that will be executed as part of the job
2727
steps:
2828
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
3030

3131
# Make sure the stable version of Flutter is available
32-
- uses: subosito/flutter-action@v1
32+
- uses: subosito/flutter-action@v2
3333
with:
3434
channel: 'stable'
3535

@@ -40,7 +40,7 @@ jobs:
4040

4141
# Run Flutter Format to ensure formatting is valid
4242
- name: Run Flutter Format
43-
run: flutter format --set-exit-if-changed .
43+
run: dart format --set-exit-if-changed .
4444
working-directory: ${{env.source-directory}}
4545

4646
analyze:
@@ -55,10 +55,10 @@ jobs:
5555
# Steps represent a sequence of tasks that will be executed as part of the job
5656
steps:
5757
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
58-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v3
5959

6060
# Make sure the stable version of Flutter is available
61-
- uses: subosito/flutter-action@v1
61+
- uses: subosito/flutter-action@v2
6262
with:
6363
channel: 'stable'
6464

@@ -85,15 +85,16 @@ jobs:
8585
# Steps represent a sequence of tasks that will be executed as part of the job
8686
steps:
8787
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
88-
- uses: actions/checkout@v2
88+
- uses: actions/checkout@v3
8989

9090
# Ensure correct JAVA version is installed.
91-
- uses: actions/setup-java@v1
91+
- uses: actions/setup-java@v3
9292
with:
93-
java-version: '12.x'
93+
distribution: 'zulu'
94+
java-version: '17'
9495

9596
# Make sure the stable version of Flutter is available
96-
- uses: subosito/flutter-action@v1
97+
- uses: subosito/flutter-action@v2
9798
with:
9899
channel: 'stable'
99100

@@ -120,10 +121,10 @@ jobs:
120121
# Steps represent a sequence of tasks that will be executed as part of the job
121122
steps:
122123
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
123-
- uses: actions/checkout@v2
124+
- uses: actions/checkout@v3
124125

125126
# Make sure the stable version of Flutter is available
126-
- uses: subosito/flutter-action@v1
127+
- uses: subosito/flutter-action@v2
127128
with:
128129
channel: 'stable'
129130

@@ -150,10 +151,10 @@ jobs:
150151
# Steps represent a sequence of tasks that will be executed as part of the job
151152
steps:
152153
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
153-
- uses: actions/checkout@v2
154+
- uses: actions/checkout@v3
154155

155156
# Make sure the stable version of Flutter is available
156-
- uses: subosito/flutter-action@v1
157+
- uses: subosito/flutter-action@v2
157158
with:
158159
channel: 'stable'
159160

@@ -185,10 +186,10 @@ jobs:
185186
# Steps represent a sequence of tasks that will be executed as part of the job
186187
steps:
187188
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
188-
- uses: actions/checkout@v2
189+
- uses: actions/checkout@v3
189190

190191
# Make sure the stable version of Flutter is available
191-
- uses: subosito/flutter-action@v1
192+
- uses: subosito/flutter-action@v2
192193
with:
193194
channel: 'stable'
194195

@@ -224,10 +225,10 @@ jobs:
224225
- run: sudo apt-get install -y ninja-build libgtk-3-dev libblkid-dev
225226

226227
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
227-
- uses: actions/checkout@v2
228+
- uses: actions/checkout@v3
228229

229230
# Make sure the stable version of Flutter is available
230-
- uses: subosito/flutter-action@v1
231+
- uses: subosito/flutter-action@v2
231232
with:
232233
channel: 'stable'
233234

@@ -264,10 +265,10 @@ jobs:
264265
# Steps represent a sequence of tasks that will be executed as part of the job
265266
steps:
266267
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
267-
- uses: actions/checkout@v2
268+
- uses: actions/checkout@v3
268269

269270
# Make sure the stable version of Flutter is available
270-
- uses: subosito/flutter-action@v1
271+
- uses: subosito/flutter-action@v2
271272
with:
272273
channel: 'stable'
273274

@@ -292,10 +293,10 @@ jobs:
292293
# Steps represent a sequence of tasks that will be executed as part of the job
293294
steps:
294295
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
295-
- uses: actions/checkout@v2
296+
- uses: actions/checkout@v3
296297

297298
# Make sure the stable version of Flutter is available
298-
- uses: subosito/flutter-action@v1
299+
- uses: subosito/flutter-action@v2
299300
with:
300301
channel: 'stable'
301302

@@ -310,8 +311,8 @@ jobs:
310311
working-directory: ${{env.source-directory}}
311312

312313
# Upload code coverage information
313-
- uses: codecov/codecov-action@v1
314+
- uses: codecov/codecov-action@v3
314315
with:
315-
file: ${{env.source-directory}}/coverage/lcov.info # optional
316-
name: CacheManager # optional
317-
fail_ci_if_error: true
316+
files: ${{env.source-directory}}/coverage/lcov.info
317+
name: CacheManager
318+
fail_ci_if_error: true

‎flutter_cache_manager/.gitignore

Lines changed: 16 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,44 @@
11
# Miscellaneous
22
*.class
3-
*.lock
43
*.log
54
*.pyc
65
*.swp
76
.DS_Store
87
.atom/
98
.buildlog/
109
.history
11-
.project
1210
.svn/
13-
bin/
11+
migrate_working_dir/
1412

1513
# IntelliJ related
1614
*.iml
1715
*.ipr
1816
*.iws
1917
.idea/
2018

21-
# Android Studio related
22-
android/.classpath
23-
android/.settings/
24-
25-
# 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
19+
# The .vscode folder contains launch configuration and tasks you configure in
20+
# VS Code which you may wish to be included in version control, so this line
21+
# is commented out by default.
22+
#.vscode/
3923

4024
# Flutter/Dart/Pub related
4125
**/doc/api/
26+
**/ios/Flutter/.last_build_id
4227
.dart_tool/
4328
.flutter-plugins
29+
.flutter-plugins-dependencies
4430
.packages
4531
.pub-cache/
4632
.pub/
47-
build/
48-
flutter_*.png
49-
linked_*.ds
50-
unlinked.ds
51-
unlinked_spec.ds
52-
flutter_export_environment.sh
33+
/build/
5334

54-
# Android related
55-
**/android/**/gradle-wrapper.jar
56-
**/android/.gradle
57-
**/android/captures/
58-
**/android/gradlew
59-
**/android/gradlew.bat
60-
**/android/local.properties
61-
**/android/**/GeneratedPluginRegistrant.java
35+
# Symbolication related
36+
app.*.symbols
6237

63-
# iOS/XCode related
64-
**/ios/**/*.mode1v3
65-
**/ios/**/*.mode2v3
66-
**/ios/**/*.moved-aside
67-
**/ios/**/*.pbxuser
68-
**/ios/**/*.perspectivev3
69-
**/ios/**/*sync/
70-
**/ios/**/.sconsign.dblite
71-
**/ios/**/.tags*
72-
**/ios/**/.vagrant/
73-
**/ios/**/DerivedData/
74-
**/ios/**/Icon?
75-
**/ios/**/Pods/
76-
**/ios/**/.symlinks/
77-
**/ios/**/profile
78-
**/ios/**/xcuserdata
79-
**/ios/.generated/
80-
**/ios/Flutter/App.framework
81-
**/ios/Flutter/Flutter.framework
82-
**/ios/Flutter/Generated.xcconfig
83-
**/ios/Flutter/app.flx
84-
**/ios/Flutter/app.zip
85-
**/ios/Flutter/flutter_assets/
86-
**/ios/ServiceDefinitions.json
87-
**/ios/Runner/GeneratedPluginRegistrant.*
38+
# Obfuscation related
39+
app.*.map.json
8840

89-
# Exceptions to above rules.
90-
!**/ios/**/default.mode1v3
91-
!**/ios/**/default.mode2v3
92-
!**/ios/**/default.pbxuser
93-
!**/ios/**/default.perspectivev3
94-
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
95-
example/.flutter-plugins-dependencies
41+
# Android Studio will place build artifacts here
42+
/android/app/debug
43+
/android/app/profile
44+
/android/app/release

‎flutter_cache_manager/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [3.3.1] - 2023-07-03
2+
* Support Dart 3.0.0 for http ^1.0.0 and file ^7.0.0
3+
* Update example
4+
* Add topics
5+
16
## [3.3.0] - 2021-11-29
27
* Added option to manage the log level. Doesn't print failed downloads by default anymore. You can set it like this:
38
```dart

‎flutter_cache_manager/analysis_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include: package:flutter_lints/flutter.yaml
1+
include: package:flutter_lints/flutter.yaml

‎flutter_cache_manager/example/.gitignore

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Miscellaneous
22
*.class
3-
*.lock
43
*.log
54
*.pyc
65
*.swp
@@ -9,64 +8,37 @@
98
.buildlog/
109
.history
1110
.svn/
11+
migrate_working_dir/
1212

1313
# IntelliJ related
1414
*.iml
1515
*.ipr
1616
*.iws
1717
.idea/
1818

19-
# Visual Studio Code related
20-
.vscode/
19+
# The .vscode folder contains launch configuration and tasks you configure in
20+
# VS Code which you may wish to be included in version control, so this line
21+
# is commented out by default.
22+
#.vscode/
2123

2224
# Flutter/Dart/Pub related
2325
**/doc/api/
26+
**/ios/Flutter/.last_build_id
2427
.dart_tool/
2528
.flutter-plugins
29+
.flutter-plugins-dependencies
2630
.packages
2731
.pub-cache/
2832
.pub/
29-
build/
33+
/build/
3034

31-
# Android related
32-
**/android/**/gradle-wrapper.jar
33-
**/android/.gradle
34-
**/android/captures/
35-
**/android/gradlew
36-
**/android/gradlew.bat
37-
**/android/local.properties
38-
**/android/**/GeneratedPluginRegistrant.java
35+
# Symbolication related
36+
app.*.symbols
3937

40-
# iOS/XCode related
41-
**/ios/**/*.mode1v3
42-
**/ios/**/*.mode2v3
43-
**/ios/**/*.moved-aside
44-
**/ios/**/*.pbxuser
45-
**/ios/**/*.perspectivev3
46-
**/ios/**/*sync/
47-
**/ios/**/.sconsign.dblite
48-
**/ios/**/.tags*
49-
**/ios/**/.vagrant/
50-
**/ios/**/DerivedData/
51-
**/ios/**/Icon?
52-
**/ios/**/Pods/
53-
**/ios/**/.symlinks/
54-
**/ios/**/profile
55-
**/ios/**/xcuserdata
56-
**/ios/.generated/
57-
**/ios/Flutter/App.framework
58-
**/ios/Flutter/Flutter.framework
59-
**/ios/Flutter/Generated.xcconfig
60-
**/ios/Flutter/app.flx
61-
**/ios/Flutter/app.zip
62-
**/ios/Flutter/flutter_assets/
63-
**/ios/Flutter/flutter_export_environment.sh
64-
**/ios/ServiceDefinitions.json
65-
**/ios/Runner/GeneratedPluginRegistrant.*
38+
# Obfuscation related
39+
app.*.map.json
6640

67-
# Exceptions to above rules.
68-
!**/ios/**/default.mode1v3
69-
!**/ios/**/default.mode2v3
70-
!**/ios/**/default.pbxuser
71-
!**/ios/**/default.perspectivev3
72-
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
41+
# Android Studio will place build artifacts here
42+
/android/app/debug
43+
/android/app/profile
44+
/android/app/release

‎flutter_cache_manager/example/README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
# example
2-
3-
A new Flutter project.
4-
5-
## Getting Started
6-
7-
For help getting started with Flutter, view our online
8-
[documentation](https://flutter.io/).
1+
# A project that showcases usage of flutter_cache_manager

‎flutter_cache_manager/example/analysis_options.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include: package:flutter_lints/flutter.yaml
1+
include: package:flutter_lints/flutter.yaml

‎flutter_cache_manager/example/android/app/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 30
29+
namespace "com.baseflow.example"
30+
compileSdkVersion 33
31+
ndkVersion flutter.ndkVersion
3032

3133
compileOptions {
3234
sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,10 +44,9 @@ android {
4244
}
4345

4446
defaultConfig {
45-
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
46-
applicationId "com.example.example"
47-
minSdkVersion 16
48-
targetSdkVersion 30
47+
applicationId "com.baseflow.example"
48+
minSdkVersion 21
49+
targetSdkVersion 33
4950
versionCode flutterVersionCode.toInteger()
5051
versionName flutterVersionName
5152
}

0 commit comments

Comments
 (0)