Skip to content

Commit 761ca45

Browse files
committed
Merge branch 'develop' into custom-cache-key
# Conflicts: # flutter_cache_manager/lib/src/cache_manager.dart # flutter_cache_manager/lib/src/cache_store.dart
2 parents 50bda4f + 60ff5c1 commit 761ca45

File tree

116 files changed

+730
-102
lines changed

Some content is hidden

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

116 files changed

+730
-102
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: Baseflow
2+
custom: https://baseflow.com/contact

README.md

Lines changed: 25 additions & 0 deletions

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

android/local.properties

Lines changed: 0 additions & 3 deletions
This file was deleted.
File renamed without changes.

flutter_cache_manager/.gitignore

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# Miscellaneous
2+
*.class
3+
*.lock
4+
*.log
5+
*.pyc
6+
*.swp
7+
.DS_Store
8+
.atom/
9+
.buildlog/
10+
.history
11+
.project
12+
.svn/
13+
bin/
14+
15+
# IntelliJ related
16+
*.iml
17+
*.ipr
18+
*.iws
19+
.idea/
20+
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
39+
40+
# Flutter/Dart/Pub related
41+
**/doc/api/
42+
.dart_tool/
43+
.flutter-plugins
44+
.packages
45+
.pub-cache/
46+
.pub/
47+
build/
48+
flutter_*.png
49+
linked_*.ds
50+
unlinked.ds
51+
unlinked_spec.ds
52+
flutter_export_environment.sh
53+
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
62+
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.*
88+
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

CHANGELOG.md renamed to flutter_cache_manager/CHANGELOG.md

Lines changed: 7 additions & 0 deletions

flutter_cache_manager/LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
The MIT License (MIT)
3+
4+
Copyright (c) 2017 Rene Floor
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

flutter_cache_manager/README.md

Lines changed: 75 additions & 0 deletions
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
GeneratedPluginRegistrant.java
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.example.example">
3+
<!-- Flutter needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.example.example
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity: FlutterActivity() {
6+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.example.example">
3+
<!-- Flutter needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
*.mode1v3
2+
*.mode2v3
3+
*.moved-aside
4+
*.pbxuser
5+
*.perspectivev3
6+
**/*sync/
7+
.sconsign.dblite
8+
.tags*
9+
**/.vagrant/
10+
**/DerivedData/
11+
Icon?
12+
**/Pods/
13+
**/.symlinks/
14+
profile
15+
xcuserdata
16+
**/.generated/
17+
Flutter/App.framework
18+
Flutter/Flutter.framework
19+
Flutter/Flutter.podspec
20+
Flutter/Generated.xcconfig
21+
Flutter/app.flx
22+
Flutter/app.zip
23+
Flutter/flutter_assets/
24+
Flutter/flutter_export_environment.sh
25+
ServiceDefinitions.json
26+
Runner/GeneratedPluginRegistrant.*
27+
28+
# Exceptions to above rules.
29+
!default.mode1v3
30+
!default.mode2v3
31+
!default.pbxuser
32+
!default.perspectivev3
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>PreviewsEnabled</key>
6+
<false/>
7+
</dict>
8+
</plist>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import UIKit
2+
import Flutter
3+
4+
@UIApplicationMain
5+
@objc class AppDelegate: FlutterAppDelegate {
6+
override func application(
7+
_ application: UIApplication,
8+
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
9+
) -> Bool {
10+
GeneratedPluginRegistrant.register(with: self)
11+
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
12+
}
13+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#import "GeneratedPluginRegistrant.h"

0 commit comments

Comments
 (0)