Skip to content

Commit 046c6af

Browse files
committed
* Upgrade dependencies
* Fix loading forever when login without network * Add safe area home & chat page * Fix syntax warning on Flutter 3
1 parent a12c19f commit 046c6af

21 files changed

+1098
-483
lines changed

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
1515
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
1616

1717
android {
18-
compileSdkVersion 28
18+
compileSdkVersion 33
1919

2020
lintOptions {
2121
disable 'InvalidPackage'

android/build.gradle

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
buildscript {
22
repositories {
33
google()
4-
jcenter()
4+
mavenCentral()
55
}
66

77
dependencies {
8-
// Example existing classpath
9-
classpath 'com.android.tools.build:gradle:3.5.3'
10-
// Add the google services classpath
8+
classpath 'com.android.tools.build:gradle:7.1.2'
119
classpath 'com.google.gms:google-services:4.3.2'
1210
}
1311
}
1412

1513
allprojects {
1614
repositories {
1715
google()
18-
jcenter()
16+
mavenCentral()
1917
}
2018
}
2119

@@ -26,16 +24,7 @@ subprojects {
2624
subprojects {
2725
project.evaluationDependsOn(':app')
2826
}
29-
subprojects {
30-
project.configurations.all {
31-
resolutionStrategy.eachDependency { details ->
32-
if (details.requested.group == 'com.android.support'
33-
&& !details.requested.name.contains('multidex') ) {
34-
details.useVersion "26.1.0"
35-
}
36-
}
37-
}
38-
}
27+
3928
task clean(type: Delete) {
4029
delete rootProject.buildDir
4130
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Jul 08 23:03:42 ICT 2019
1+
#Fri Jun 23 08:50:38 CEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

android/settings.gradle

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
include ':app'
22

3-
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
3+
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4+
def properties = new Properties()
45

5-
def plugins = new Properties()
6-
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
7-
if (pluginsFile.exists()) {
8-
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
9-
}
6+
assert localPropertiesFile.exists()
7+
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
108

11-
plugins.each { name, path ->
12-
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
13-
include ":$name"
14-
project(":$name").projectDir = pluginDirectory
15-
}
9+
def flutterSdkPath = properties.getProperty("flutter.sdk")
10+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11+
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

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>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

ios/Flutter/Flutter.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
1111
s.license = { :type => 'MIT' }
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 = '8.0'
14+
s.ios.deployment_target = '9.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'
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/lap01434/Documents/Flutter/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/lap01434/Documents/Flutter/flutter-chat-demo"
3+
export "FLUTTER_ROOT=/Users/lap02687/Documents/Flutter/flutter3"
4+
export "FLUTTER_APPLICATION_PATH=/Users/lap02687/Documents/Flutter/flutter-chat-demo"
55
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
6-
export "FLUTTER_TARGET=/Users/lap01434/Documents/Flutter/flutter-chat-demo/lib/main.dart"
6+
export "FLUTTER_TARGET=/Users/lap02687/Documents/Flutter/flutter-chat-demo/lib/main.dart"
77
export "FLUTTER_BUILD_DIR=build"
8-
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
98
export "FLUTTER_BUILD_NAME=1.0.0"
109
export "FLUTTER_BUILD_NUMBER=1"
1110
export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ=="
1211
export "DART_OBFUSCATION=false"
1312
export "TRACK_WIDGET_CREATION=true"
1413
export "TREE_SHAKE_ICONS=false"
15-
export "PACKAGE_CONFIG=/Users/lap01434/Documents/Flutter/flutter-chat-demo/.dart_tool/package_config.json"
14+
export "PACKAGE_CONFIG=/Users/lap02687/Documents/Flutter/flutter-chat-demo/.dart_tool/package_config.json"

ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
2828
flutter_ios_podfile_setup
2929

3030
target 'Runner' do
31+
use_frameworks!
32+
use_modular_headers!
33+
3134
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3235
end
3336

0 commit comments

Comments
 (0)