Skip to content

Commit 44b4830

Browse files
demchenkoalexdemchenkoalex
committed
update firebase
1 parent 6489407 commit 44b4830

38 files changed

+1054
-622
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.6.8
2+
3+
- **BREAKING CHANGE**: Update firebase to the latest SDK.
4+
15
## 1.6.7
26

37
- Update dependencies. Requires Dart >= 2.19.0.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2023 Oleksandr Demchenko
189+
Copyright 2024 Oleksandr Demchenko
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎example/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ migrate_working_dir/
2727
.dart_tool/
2828
.flutter-plugins
2929
.flutter-plugins-dependencies
30-
.packages
3130
.pub-cache/
3231
.pub/
3332
/build/
@@ -47,3 +46,4 @@ app.*.map.json
4746
GoogleService-Info.plist
4847
google-services.json
4948
firebase_app_id_file.json
49+
firebase.json

‎example/.metadata‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled.
4+
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
8-
channel: stable
7+
revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
8+
channel: "stable"
99

1010
project_type: app
1111

1212
# Tracks metadata for the flutter migrate command
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
17-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
16+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
17+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
1818
- platform: android
19-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
20-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
19+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
20+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
2121
- platform: ios
22-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
23-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
22+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
23+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
2424
- platform: linux
25-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
26-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
25+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
26+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
2727
- platform: macos
28-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
29-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
28+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
29+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
3030
- platform: web
31-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
32-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
31+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
32+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
3333
- platform: windows
34-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
35-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
34+
create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
35+
base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
3636

3737
# User provided section
3838

‎example/analysis_options.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ linter:
1717
# The lint rules applied to this project can be customized in the
1818
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
1919
# included above or to enable additional rules. A list of all available lints
20-
# and their documentation is published at
21-
# https://dart-lang.github.io/linter/lints/index.html.
20+
# and their documentation is published at https://dart.dev/lints.
2221
#
2322
# Instead of disabling a lint rule for the entire project in the
2423
# section below, it can also be suppressed for a single line of code

‎example/android/app/build.gradle‎

Lines changed: 28 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,61 @@
1+
plugins {
2+
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
// END: FlutterFire Configuration
6+
id "kotlin-android"
7+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
8+
id "dev.flutter.flutter-gradle-plugin"
9+
}
10+
111
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
12+
def localPropertiesFile = rootProject.file("local.properties")
313
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
14+
localPropertiesFile.withReader("UTF-8") { reader ->
515
localProperties.load(reader)
616
}
717
}
818

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
19+
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
1520
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
21+
flutterVersionCode = "1"
1722
}
1823

19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
24+
def flutterVersionName = localProperties.getProperty("flutter.versionName")
2025
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
26+
flutterVersionName = "1.0"
2227
}
2328

24-
apply plugin: 'com.android.application'
25-
// START: FlutterFire Configuration
26-
apply plugin: 'com.google.gms.google-services'
27-
// END: FlutterFire Configuration
28-
apply plugin: 'kotlin-android'
29-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
30-
3129
android {
32-
namespace "com.example"
33-
compileSdkVersion flutter.compileSdkVersion
34-
ndkVersion flutter.ndkVersion
30+
namespace = "com.example"
31+
compileSdk = flutter.compileSdkVersion
32+
ndkVersion = flutter.ndkVersion
3533

3634
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_8
38-
targetCompatibility JavaVersion.VERSION_1_8
39-
}
40-
41-
kotlinOptions {
42-
jvmTarget = '1.8'
43-
}
44-
45-
sourceSets {
46-
main.java.srcDirs += 'src/main/kotlin'
35+
sourceCompatibility = JavaVersion.VERSION_1_8
36+
targetCompatibility = JavaVersion.VERSION_1_8
4737
}
4838

4939
defaultConfig {
5040
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
51-
applicationId "com.example"
41+
applicationId = "com.example"
5242
// You can update the following values to match your application needs.
5343
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
54-
minSdkVersion 19
55-
targetSdkVersion flutter.targetSdkVersion
56-
multiDexEnabled true
57-
versionCode flutterVersionCode.toInteger()
58-
versionName flutterVersionName
44+
minSdk = 23
45+
targetSdk = flutter.targetSdkVersion
46+
versionCode = flutterVersionCode.toInteger()
47+
versionName = flutterVersionName
5948
}
6049

6150
buildTypes {
6251
release {
6352
// TODO: Add your own signing config for the release build.
6453
// Signing with the debug keys for now, so `flutter run --release` works.
65-
signingConfig signingConfigs.debug
54+
signingConfig = signingConfigs.debug
6655
}
6756
}
6857
}
6958

7059
flutter {
71-
source '../..'
72-
}
73-
74-
dependencies {
75-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
76-
implementation 'com.android.support:multidex:1.0.3'
60+
source = "../.."
7761
}

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:name=".MainActivity"
88
android:exported="true"
99
android:launchMode="singleTop"
10+
android:taskAffinity=""
1011
android:theme="@style/LaunchTheme"
1112
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1213
android:hardwareAccelerated="true"
@@ -30,18 +31,15 @@
3031
android:name="flutterEmbedding"
3132
android:value="2" />
3233
</application>
34+
<!-- Required to query activities that can process text, see:
35+
https://developer.android.com/training/package-visibility and
36+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
3337
34-
<!-- Required for url and mailto launching via url_launcher -->
38+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
3539
<queries>
36-
<!-- If your app opens https URLs -->
3740
<intent>
38-
<action android:name="android.intent.action.VIEW" />
39-
<data android:scheme="https" />
40-
</intent>
41-
<!-- If your app sends emails -->
42-
<intent>
43-
<action android:name="android.intent.action.SEND" />
44-
<data android:mimeType="*/*" />
41+
<action android:name="android.intent.action.PROCESS_TEXT"/>
42+
<data android:mimeType="text/plain"/>
4543
</intent>
4644
</queries>
4745
</manifest>

‎example/android/app/src/main/kotlin/com/example/MainActivity.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎example/android/build.gradle‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
1-
buildscript {
2-
ext.kotlin_version = '1.7.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.3.0'
10-
// START: FlutterFire Configuration
11-
classpath 'com.google.gms:google-services:4.3.14'
12-
// END: FlutterFire Configuration
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
}
15-
}
16-
171
allprojects {
182
repositories {
193
google()
204
mavenCentral()
215
}
226
}
237

24-
rootProject.buildDir = '../build'
8+
rootProject.buildDir = "../build"
259
subprojects {
2610
project.buildDir = "${rootProject.buildDir}/${project.name}"
2711
}
2812
subprojects {
29-
project.evaluationDependsOn(':app')
13+
project.evaluationDependsOn(":app")
3014
}
3115

3216
tasks.register("clean", Delete) {

‎example/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
22
android.useAndroidX=true
33
android.enableJetifier=true

0 commit comments

Comments
 (0)