Skip to content

Commit d49b0d7

Browse files
committed
Upgrade all examples to latest Flutter
1 parent 63a3a78 commit d49b0d7

File tree

285 files changed

+2023
-4704
lines changed

Some content is hidden

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

285 files changed

+2023
-4704
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"cloud_firestore","dependencies":["firebase_core"]},{"name":"firebase_auth","dependencies":["firebase_core","firebase_auth_web"]},{"name":"firebase_auth_web","dependencies":[]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"path_provider","dependencies":[]}]}

bloc_flutter/.metadata

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 68587a0916366e9512a78df22c44163d041dd5f3
7+
revision: 27321ebbad34b0a3fafe99fac037102196d655ff
88
channel: stable
99

1010
project_type: app

bloc_flutter/android/.gitignore

+7
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

bloc_flutter/android/app/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ android {
3737
}
3838

3939
defaultConfig {
40-
multiDexEnabled true
4140
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4241
applicationId "com.example.bloc_flutter"
4342
minSdkVersion 16
4443
targetSdkVersion 28
4544
versionCode flutterVersionCode.toInteger()
4645
versionName flutterVersionName
47-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
46+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
47+
multiDexEnabled true
4848
}
4949

5050
buildTypes {
@@ -63,6 +63,6 @@ flutter {
6363
dependencies {
6464
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6565
testImplementation 'junit:junit:4.12'
66-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
67-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
66+
androidTestImplementation 'androidx.test:runner:1.1.1'
67+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
6868
}

bloc_flutter/android/app/google-services.json

-55
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.example.bloc_flutter">
3-
43
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
54
calls FlutterMain.startInitialization(this); in its onCreate method.
65
In most cases you can leave this as-is, but you if you want to provide
@@ -14,20 +13,18 @@
1413
android:name=".MainActivity"
1514
android:launchMode="singleTop"
1615
android:theme="@style/LaunchTheme"
17-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
16+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1817
android:hardwareAccelerated="true"
1918
android:windowSoftInputMode="adjustResize">
20-
<!-- This keeps the window background of the activity showing
21-
until Flutter renders its first frame. It can be removed if
22-
there is no splash screen (such as the default splash screen
23-
defined in @style/LaunchTheme). -->
24-
<meta-data
25-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
26-
android:value="true" />
2719
<intent-filter>
2820
<action android:name="android.intent.action.MAIN"/>
2921
<category android:name="android.intent.category.LAUNCHER"/>
3022
</intent-filter>
3123
</activity>
24+
<!-- Don't delete the meta-data below.
25+
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
26+
<meta-data
27+
android:name="flutterEmbedding"
28+
android:value="2" />
3229
</application>
3330
</manifest>
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.example.bloc_flutter
22

3-
import android.os.Bundle
4-
5-
import io.flutter.app.FlutterActivity
3+
import androidx.annotation.NonNull;
4+
import io.flutter.embedding.android.FlutterActivity
5+
import io.flutter.embedding.engine.FlutterEngine
66
import io.flutter.plugins.GeneratedPluginRegistrant
77

88
class MainActivity: FlutterActivity() {
9-
override fun onCreate(savedInstanceState: Bundle?) {
10-
super.onCreate(savedInstanceState)
11-
GeneratedPluginRegistrant.registerWith(this)
12-
}
9+
override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
10+
GeneratedPluginRegistrant.registerWith(flutterEngine);
11+
}
1312
}

bloc_flutter/android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.71'
2+
ext.kotlin_version = '1.3.50'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.5.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
2-
2+
android.enableR8=true
3+
android.useAndroidX=true
4+
android.enableJetifier=true
Binary file not shown.

bloc_flutter/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

bloc_flutter/android/gradlew

-160
This file was deleted.

0 commit comments

Comments
 (0)