Skip to content

Commit e014ca3

Browse files
committed
chore(example): Regen example app with latest flutter stable version
1 parent ca8100e commit e014ca3

File tree

26 files changed

+355
-145
lines changed

26 files changed

+355
-145
lines changed

Diff for: example/.gitignore

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.buildlog/
99
.history
1010
.svn/
11+
migrate_working_dir/
1112

1213
# IntelliJ related
1314
*.iml
@@ -26,14 +27,10 @@
2627
.dart_tool/
2728
.flutter-plugins
2829
.flutter-plugins-dependencies
29-
.packages
3030
.pub-cache/
3131
.pub/
3232
/build/
3333

34-
# Web related
35-
lib/generated_plugin_registrant.dart
36-
3734
# Symbolication related
3835
app.*.symbols
3936

Diff for: example/.metadata

+5-23
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,20 @@
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: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
8-
channel: stable
7+
revision: "68bfaea224880b488c617afe30ab12091ea8fa4e"
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: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
17-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
18-
- platform: android
19-
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
20-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
21-
- platform: ios
22-
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
23-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
24-
- platform: linux
25-
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
26-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
27-
- platform: macos
28-
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
29-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
30-
- platform: web
31-
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
32-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
33-
- platform: windows
34-
create_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
35-
base_revision: 9cd3d0d9ff05768afa249e036acc66e8abe93bff
16+
create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
17+
base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
3618

3719
# User provided section
3820

Diff for: example/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# example
1+
# introduction_example
22

33
A new Flutter project.
44

@@ -8,9 +8,9 @@ This project is a starting point for a Flutter application.
88

99
A few resources to get you started if this is your first Flutter project:
1010

11-
- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
12-
- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
11+
- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
12+
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
1313

14-
For help getting started with Flutter, view our
15-
[online documentation](https://flutter.dev/docs), which offers tutorials,
14+
For help getting started with Flutter development, view the
15+
[online documentation](https://docs.flutter.dev/), which offers tutorials,
1616
samples, guidance on mobile development, and a full API reference.

Diff for: example/analysis_options.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ linter:
1313
# The lint rules applied to this project can be customized in the
1414
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
1515
# included above or to enable additional rules. A list of all available lints
16-
# and their documentation is published at
17-
# https://dart-lang.github.io/linter/lints/index.html.
16+
# and their documentation is published at https://dart.dev/lints.
1817
#
1918
# Instead of disabling a lint rule for the entire project in the
2019
# section below, it can also be suppressed for a single line of code

Diff for: example/android/app/build.gradle

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

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-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,13 +22,9 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2825
android {
29-
namespace "com.example.example"
30-
compileSdkVersion flutter.compileSdkVersion
26+
namespace "fr.pyozer.introduction_example"
27+
compileSdk flutter.compileSdkVersion
3128
ndkVersion flutter.ndkVersion
3229

3330
compileOptions {
@@ -45,7 +42,7 @@ android {
4542

4643
defaultConfig {
4744
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
48-
applicationId "com.example.example"
45+
applicationId "fr.pyozer.introduction_example"
4946
// You can update the following values to match your application needs.
5047
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
5148
minSdkVersion flutter.minSdkVersion
@@ -67,6 +64,4 @@ flutter {
6764
source '../..'
6865
}
6966

70-
dependencies {
71-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
72-
}
67+
dependencies {}

Diff for: example/android/app/src/main/AndroidManifest.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
22
<application
3-
android:label="example"
3+
android:label="introduction_example"
44
android:name="${applicationName}"
55
android:icon="@mipmap/ic_launcher">
66
<activity
@@ -30,4 +30,15 @@
3030
android:name="flutterEmbedding"
3131
android:value="2" />
3232
</application>
33+
<!-- Required to query activities that can process text, see:
34+
https://developer.android.com/training/package-visibility?hl=en and
35+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
36+
37+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
38+
<queries>
39+
<intent>
40+
<action android:name="android.intent.action.PROCESS_TEXT"/>
41+
<data android:mimeType="text/plain"/>
42+
</intent>
43+
</queries>
3344
</manifest>

Diff for: example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

-6
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package fr.pyozer.introduction_example
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity: FlutterActivity()

Diff for: example/android/build.gradle

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
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-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()

Diff for: example/android/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
33
android.enableJetifier=true

Diff for: example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

Diff for: example/android/settings.gradle

+23-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}
9+
settings.ext.flutterSdkPath = flutterSdkPath()
210

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
11+
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
512

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
13+
repositories {
14+
google()
15+
mavenCentral()
16+
gradlePluginPortal()
17+
}
18+
}
819

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"
20+
plugins {
21+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22+
id "com.android.application" version "7.3.0" apply false
23+
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
24+
}
25+
26+
include ":app"

Diff for: example/ios/Flutter/AppFrameworkInfo.plist

+1-1
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>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

Diff for: example/ios/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

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

0 commit comments

Comments
 (0)