Skip to content

Commit 7a478d4

Browse files
xtyxtyxxtyxtyx
authored
Merge pull request #190 from domesticmouse/update-for-Flutter-3.19
Update for Flutter 3.19
2 parents 6139cd3 + 9e601c2 commit 7a478d4

File tree

78 files changed

+1111
-461
lines changed

Some content is hidden

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

78 files changed

+1111
-461
lines changed

‎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: "abb292a07e20d696c4568099f918f6c5f330e6b0"
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: abb292a07e20d696c4568099f918f6c5f330e6b0
17+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
1818
- platform: android
19-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
20-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
19+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
20+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
2121
- platform: ios
22-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
23-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
22+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
23+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
2424
- platform: linux
25-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
26-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
25+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
26+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
2727
- platform: macos
28-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
29-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
28+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
29+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
3030
- platform: web
31-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
32-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
31+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
32+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
3333
- platform: windows
34-
create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
35-
base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
34+
create_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
35+
base_revision: abb292a07e20d696c4568099f918f6c5f330e6b0
3636

3737
# User provided section
3838

‎example/android/app/build.gradle‎

Lines changed: 12 additions & 13 deletions
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,12 +22,10 @@ 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-
compileSdkVersion flutter.compileSdkVersion
26+
namespace "com.example.example"
27+
compileSdk flutter.compileSdkVersion
28+
ndkVersion flutter.ndkVersion
3029

3130
compileOptions {
3231
sourceCompatibility JavaVersion.VERSION_1_8
@@ -44,6 +43,8 @@ android {
4443
defaultConfig {
4544
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4645
applicationId "com.example.example"
46+
// You can update the following values to match your application needs.
47+
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
4748
minSdkVersion flutter.minSdkVersion
4849
targetSdkVersion flutter.targetSdkVersion
4950
versionCode flutterVersionCode.toInteger()
@@ -63,6 +64,4 @@ flutter {
6364
source '../..'
6465
}
6566

66-
dependencies {
67-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
68-
}
67+
dependencies {}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
3-
<!-- Flutter needs it to communicate with the running application
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<!-- The INTERNET permission is required for development. Specifically,
3+
the Flutter tool needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
66
<uses-permission android:name="android.permission.INTERNET"/>

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
3-
<application
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<application
43
android:label="example"
54
android:name="${applicationName}"
65
android:icon="@mipmap/ic_launcher">
@@ -31,4 +30,15 @@
3130
android:name="flutterEmbedding"
3231
android:value="2" />
3332
</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>
3444
</manifest>

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

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

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

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

‎example/android/app/src/main/res/values-night/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

‎example/android/app/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
44
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
88
</style>
99
<!-- Theme applied to the Android Window as soon as the process has started.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
3-
<!-- Flutter needs it to communicate with the running application
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<!-- The INTERNET permission is required for development. Specifically,
3+
the Flutter tool needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
66
<uses-permission android:name="android.permission.INTERNET"/>

‎example/android/build.gradle‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.6.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
@@ -26,6 +13,6 @@ subprojects {
2613
project.evaluationDependsOn(':app')
2714
}
2815

29-
task clean(type: Delete) {
16+
tasks.register("clean", Delete) {
3017
delete rootProject.buildDir
3118
}

‎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
22
android.useAndroidX=true
33
android.enableJetifier=true

0 commit comments

Comments
 (0)