Skip to content

Commit df37b8a

Browse files
hukusuke1007hukusuke1007
authored
Feature/flutter3 (#42)
* update * update * update * update * update * Update pubspec.yaml * update * update
1 parent 602097b commit df37b8a

File tree

101 files changed

+468
-2019
lines changed

Some content is hidden

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

101 files changed

+468
-2019
lines changed

‎flamingo/CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
# 2.18.0
1+
# 3.0.0
2+
Updated Plugins and modified example code.
3+
4+
## 2.18.0
25
Updated Plugins and modified example code.
36

47
## 2.17.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646
defaultConfig {
4747
applicationId "com.gmail.hukusuke1007.flamingo_example"
4848
minSdkVersion 24
49-
targetSdkVersion 31
49+
targetSdkVersion flutter.targetSdkVersion
5050
versionCode flutterVersionCode.toInteger()
5151
versionName flutterVersionName
5252
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

‎flamingo/example/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext.kotlin_version = '1.6.10'
33
repositories {
44
google()
5-
jcenter()
5+
mavenCentral()
66
}
77

88
dependencies {
@@ -15,7 +15,7 @@ buildscript {
1515
allprojects {
1616
repositories {
1717
google()
18-
jcenter()
18+
mavenCentral()
1919
}
2020
}
2121

‎flamingo/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎flamingo/example/ios/Flutter/Flutter.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
Pod::Spec.new do |s|
77
s.name = 'Flutter'
88
s.version = '1.0.0'
9-
s.summary = 'High-performance, high-fidelity mobile apps.'
10-
s.homepage = 'https://flutter.io'
11-
s.license = { :type => 'MIT' }
9+
s.summary = 'A UI toolkit for beautiful and fast apps.'
10+
s.homepage = 'https://flutter.dev'
11+
s.license = { :type => 'BSD' }
1212
s.author = { 'Flutter Dev Team' => '[email protected]' }
1313
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
14-
s.ios.deployment_target = '9.0'
14+
s.ios.deployment_target = '11.0'
1515
# Framework linking is handled by Flutter tooling, not CocoaPods.
1616
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
1717
s.vendored_frameworks = 'path/to/nothing'

‎flamingo/example/ios/Podfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
# platform :ios, '11.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
66

7-
$FirebaseSdkVersion = '9.3.0'
7+
$FirebaseSdkVersion = '10.3.0'
88

99
project 'Runner', {
1010
'Debug' => :debug,
@@ -42,4 +42,4 @@ post_install do |installer|
4242
installer.pods_project.targets.each do |target|
4343
flutter_additional_ios_build_settings(target)
4444
end
45-
end
45+
end

‎flamingo/example/ios/Podfile.lock‎

Lines changed: 62 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,82 @@
11
PODS:
2-
- cloud_firestore (3.4.3):
3-
- Firebase/Firestore (= 9.3.0)
2+
- cloud_firestore (4.4.2):
3+
- Firebase/Firestore (= 10.3.0)
44
- firebase_core
55
- Flutter
6-
- Firebase/CoreOnly (9.3.0):
7-
- FirebaseCore (= 9.3.0)
8-
- Firebase/Firestore (9.3.0):
6+
- nanopb (< 2.30910.0, >= 2.30908.0)
7+
- Firebase/CoreOnly (10.3.0):
8+
- FirebaseCore (= 10.3.0)
9+
- Firebase/Firestore (10.3.0):
910
- Firebase/CoreOnly
10-
- FirebaseFirestore (~> 9.3.0)
11-
- Firebase/Storage (9.3.0):
11+
- FirebaseFirestore (~> 10.3.0)
12+
- Firebase/Storage (10.3.0):
1213
- Firebase/CoreOnly
13-
- FirebaseStorage (~> 9.3.0)
14-
- firebase_core (1.20.0):
15-
- Firebase/CoreOnly (= 9.3.0)
14+
- FirebaseStorage (~> 10.3.0)
15+
- firebase_core (2.6.1):
16+
- Firebase/CoreOnly (= 10.3.0)
1617
- Flutter
17-
- firebase_storage (10.3.4):
18-
- Firebase/Storage (= 9.3.0)
18+
- firebase_storage (11.0.13):
19+
- Firebase/Storage (= 10.3.0)
1920
- firebase_core
2021
- Flutter
21-
- FirebaseAppCheckInterop (9.3.0)
22-
- FirebaseAuthInterop (9.3.0)
23-
- FirebaseCore (9.3.0):
24-
- FirebaseCoreDiagnostics (~> 9.0)
25-
- FirebaseCoreInternal (~> 9.0)
26-
- GoogleUtilities/Environment (~> 7.7)
27-
- GoogleUtilities/Logger (~> 7.7)
28-
- FirebaseCoreDiagnostics (9.3.0):
29-
- GoogleDataTransport (< 10.0.0, >= 9.1.4)
30-
- GoogleUtilities/Environment (~> 7.7)
31-
- GoogleUtilities/Logger (~> 7.7)
32-
- nanopb (< 2.30910.0, >= 2.30908.0)
33-
- FirebaseCoreExtension (9.3.0):
34-
- FirebaseCore (~> 9.0)
35-
- FirebaseCoreInternal (9.3.0):
36-
- "GoogleUtilities/NSData+zlib (~> 7.7)"
37-
- FirebaseFirestore (9.3.0):
38-
- FirebaseFirestore/AutodetectLeveldb (= 9.3.0)
39-
- FirebaseFirestore/AutodetectLeveldb (9.3.0):
22+
- FirebaseAppCheckInterop (10.4.0)
23+
- FirebaseAuthInterop (10.4.0)
24+
- FirebaseCore (10.3.0):
25+
- FirebaseCoreInternal (~> 10.0)
26+
- GoogleUtilities/Environment (~> 7.8)
27+
- GoogleUtilities/Logger (~> 7.8)
28+
- FirebaseCoreExtension (10.4.0):
29+
- FirebaseCore (~> 10.0)
30+
- FirebaseCoreInternal (10.4.0):
31+
- "GoogleUtilities/NSData+zlib (~> 7.8)"
32+
- FirebaseFirestore (10.3.0):
33+
- FirebaseFirestore/AutodetectLeveldb (= 10.3.0)
34+
- FirebaseFirestore/AutodetectLeveldb (10.3.0):
4035
- FirebaseFirestore/Base
4136
- FirebaseFirestore/WithLeveldb
42-
- FirebaseFirestore/Base (9.3.0)
43-
- FirebaseFirestore/WithLeveldb (9.3.0):
37+
- FirebaseFirestore/Base (10.3.0)
38+
- FirebaseFirestore/WithLeveldb (10.3.0):
4439
- FirebaseFirestore/Base
45-
- FirebaseStorage (9.3.0):
46-
- FirebaseAppCheckInterop (~> 9.0)
47-
- FirebaseAuthInterop (~> 9.0)
48-
- FirebaseCore (~> 9.0)
49-
- FirebaseCoreExtension (~> 9.0)
50-
- FirebaseStorageInternal (~> 9.0)
51-
- FirebaseStorageInternal (9.3.0):
52-
- FirebaseCore (~> 9.0)
53-
- GTMSessionFetcher/Core (< 3.0, >= 1.7)
40+
- FirebaseStorage (10.3.0):
41+
- FirebaseAppCheckInterop (~> 10.0)
42+
- FirebaseAuthInterop (~> 10.0)
43+
- FirebaseCore (~> 10.0)
44+
- FirebaseCoreExtension (~> 10.0)
45+
- GTMSessionFetcher/Core (< 4.0, >= 2.1)
5446
- Flutter (1.0.0)
55-
- GoogleDataTransport (9.2.0):
56-
- GoogleUtilities/Environment (~> 7.7)
57-
- nanopb (< 2.30910.0, >= 2.30908.0)
58-
- PromisesObjC (< 3.0, >= 1.2)
59-
- GoogleUtilities/Environment (7.7.0):
47+
- GoogleUtilities/Environment (7.11.0):
6048
- PromisesObjC (< 3.0, >= 1.2)
61-
- GoogleUtilities/Logger (7.7.0):
49+
- GoogleUtilities/Logger (7.11.0):
6250
- GoogleUtilities/Environment
63-
- "GoogleUtilities/NSData+zlib (7.7.0)"
64-
- GTMSessionFetcher/Core (2.0.0)
51+
- "GoogleUtilities/NSData+zlib (7.11.0)"
52+
- GTMSessionFetcher/Core (3.1.0)
6553
- nanopb (2.30909.0):
6654
- nanopb/decode (= 2.30909.0)
6755
- nanopb/encode (= 2.30909.0)
6856
- nanopb/decode (2.30909.0)
6957
- nanopb/encode (2.30909.0)
70-
- path_provider_ios (0.0.1):
58+
- path_provider_foundation (0.0.1):
7159
- Flutter
60+
- FlutterMacOS
7261
- PromisesObjC (2.1.1)
7362

7463
DEPENDENCIES:
7564
- cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
7665
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
7766
- firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
78-
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `9.3.0`)
67+
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.3.0`)
7968
- Flutter (from `Flutter`)
80-
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
69+
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
8170

8271
SPEC REPOS:
8372
trunk:
8473
- Firebase
8574
- FirebaseAppCheckInterop
8675
- FirebaseAuthInterop
8776
- FirebaseCore
88-
- FirebaseCoreDiagnostics
8977
- FirebaseCoreExtension
9078
- FirebaseCoreInternal
9179
- FirebaseStorage
92-
- FirebaseStorageInternal
93-
- GoogleDataTransport
9480
- GoogleUtilities
9581
- GTMSessionFetcher
9682
- nanopb
@@ -105,39 +91,36 @@ EXTERNAL SOURCES:
10591
:path: ".symlinks/plugins/firebase_storage/ios"
10692
FirebaseFirestore:
10793
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
108-
:tag: 9.3.0
94+
:tag: 10.3.0
10995
Flutter:
11096
:path: Flutter
111-
path_provider_ios:
112-
:path: ".symlinks/plugins/path_provider_ios/ios"
97+
path_provider_foundation:
98+
:path: ".symlinks/plugins/path_provider_foundation/ios"
11399

114100
CHECKOUT OPTIONS:
115101
FirebaseFirestore:
116102
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
117-
:tag: 9.3.0
103+
:tag: 10.3.0
118104

119105
SPEC CHECKSUMS:
120-
cloud_firestore: 08093e207dfb2e6c82a6b272def699e022548786
121-
Firebase: ef75abb1cdbc746d5a38f4e26c422c807b189b8c
122-
firebase_core: 96214f90497b808a2cf2a24517084c5f6de37b53
123-
firebase_storage: e95ec41580e311cb30b1ed7459b9e94fb4bbe672
124-
FirebaseAppCheckInterop: f6b9670fb1360cf12006ca426e9c3b9a35317d17
125-
FirebaseAuthInterop: 79826b4edc64e1d10135947866ad4437657e8696
126-
FirebaseCore: c088995ece701a021a48a1348ea0174877de2a6a
127-
FirebaseCoreDiagnostics: 060eb57cc56dfaf40b1b1b5874a5c17c41ce79f8
128-
FirebaseCoreExtension: 900b065a4970c31ce8de4e966cee910188e3a07b
129-
FirebaseCoreInternal: 635d1c9a612a6502b6377a0c92af83758076ffff
130-
FirebaseFirestore: 033f80710e26a86fd6ecf2a41441360436e45cb9
131-
FirebaseStorage: 1414d27e15fa04f6350ef6602accef0e951c8bca
132-
FirebaseStorageInternal: f1a6d64cace780580d2b8ffa0a0c8cf3c376f3f8
133-
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
134-
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
135-
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
136-
GTMSessionFetcher: 681175626052e03fdde7952f7e9c7a9785719506
106+
cloud_firestore: 2d8c9f23063a6f735004f9b52cc743f7d8c8a5ae
107+
Firebase: f92fc551ead69c94168d36c2b26188263860acd9
108+
firebase_core: 6242f038aefa4582e028536e71312f7e3a41e6bb
109+
firebase_storage: 1cf1f798f92d7d66b0bab3d866f63f1bf41def1c
110+
FirebaseAppCheckInterop: ef074633831a90cf6c10e8f2c1e1f8b7842a446a
111+
FirebaseAuthInterop: fef284922da3c350f846ff85cc0dfd5186448e49
112+
FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
113+
FirebaseCoreExtension: d209ada6f48bac53d149e996cf1b2dafa632a615
114+
FirebaseCoreInternal: e301297f4c15a17489e48ed722d733b1578e0c02
115+
FirebaseFirestore: f16ed5e8e5b024eff4928bc33605df9526bda650
116+
FirebaseStorage: 0efbff0ac978981866d89804191688ae50d64033
117+
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
118+
GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
119+
GTMSessionFetcher: c9e714f7eec91a55641e2bab9f45fd83a219b882
137120
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
138-
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
121+
path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
139122
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
140123

141-
PODFILE CHECKSUM: 13191e9e14917d800bed579615f9504170188f60
124+
PODFILE CHECKSUM: 7ac0fc9959e92330f3f2cf412fdfd089b4ee4c76
142125

143126
COCOAPODS: 1.11.3

‎flamingo/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -213,6 +213,7 @@
213213
/* Begin PBXShellScriptBuildPhase section */
214214
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
215215
isa = PBXShellScriptBuildPhase;
216+
alwaysOutOfDate = 1;
216217
buildActionMask = 2147483647;
217218
files = (
218219
);
@@ -257,34 +258,28 @@
257258
"${BUILT_PRODUCTS_DIR}/FirebaseAppCheckInterop/FirebaseAppCheckInterop.framework",
258259
"${BUILT_PRODUCTS_DIR}/FirebaseAuthInterop/FirebaseAuthInterop.framework",
259260
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
260-
"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
261261
"${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework",
262262
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
263263
"${BUILT_PRODUCTS_DIR}/FirebaseStorage/FirebaseStorage.framework",
264-
"${BUILT_PRODUCTS_DIR}/FirebaseStorageInternal/FirebaseStorageInternal.framework",
265264
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
266-
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
267265
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
268266
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
269267
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
270-
"${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework",
268+
"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
271269
);
272270
name = "[CP] Embed Pods Frameworks";
273271
outputPaths = (
274272
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAppCheckInterop.framework",
275273
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuthInterop.framework",
276274
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
277-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
278275
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework",
279276
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
280277
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseStorage.framework",
281-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseStorageInternal.framework",
282278
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
283-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
284279
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
285280
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
286281
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
287-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework",
282+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
288283
);
289284
runOnlyForDeploymentPostprocessing = 0;
290285
shellPath = /bin/sh;
@@ -293,6 +288,7 @@
293288
};
294289
9740EEB61CF901F6004384FC /* Run Script */ = {
295290
isa = PBXShellScriptBuildPhase;
291+
alwaysOutOfDate = 1;
296292
buildActionMask = 2147483647;
297293
files = (
298294
);
@@ -420,7 +416,10 @@
420416
"$(PROJECT_DIR)/Flutter",
421417
);
422418
INFOPLIST_FILE = Runner/Info.plist;
423-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
419+
LD_RUNPATH_SEARCH_PATHS = (
420+
"$(inherited)",
421+
"@executable_path/Frameworks",
422+
);
424423
LIBRARY_SEARCH_PATHS = (
425424
"$(inherited)",
426425
"$(PROJECT_DIR)/Flutter",
@@ -553,7 +552,10 @@
553552
"$(PROJECT_DIR)/Flutter",
554553
);
555554
INFOPLIST_FILE = Runner/Info.plist;
556-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
555+
LD_RUNPATH_SEARCH_PATHS = (
556+
"$(inherited)",
557+
"@executable_path/Frameworks",
558+
);
557559
LIBRARY_SEARCH_PATHS = (
558560
"$(inherited)",
559561
"$(PROJECT_DIR)/Flutter",
@@ -582,7 +584,10 @@
582584
"$(PROJECT_DIR)/Flutter",
583585
);
584586
INFOPLIST_FILE = Runner/Info.plist;
585-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
587+
LD_RUNPATH_SEARCH_PATHS = (
588+
"$(inherited)",
589+
"@executable_path/Frameworks",
590+
);
586591
LIBRARY_SEARCH_PATHS = (
587592
"$(inherited)",
588593
"$(PROJECT_DIR)/Flutter",

‎flamingo/example/ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
<false/>
4444
<key>CADisableMinimumFrameDurationOnPhone</key>
4545
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4648
</dict>
4749
</plist>

0 commit comments

Comments
 (0)