Skip to content

Commit 46597c7

Browse files
Merge branch 'main' into kotlin-gradle-all-plugins
2 parents e30d40d + ee460d6 commit 46597c7

File tree

124 files changed

+1142
-1033
lines changed

Some content is hidden

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

124 files changed

+1142
-1033
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d18214307703b9672fd278837409e7d67e99a094
1+
2ec61af30672ebfaf625d7127dd5c99e1796b949
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This file tracks properties of this Flutter project.
2+
# Used by Flutter tool to assess capabilities and perform upgrades etc.
3+
#
4+
# This file should be version controlled and should not be manually edited.
5+
6+
version:
7+
revision: "582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536"
8+
channel: "stable"
9+
10+
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536
17+
base_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536
18+
- platform: android
19+
create_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536
20+
base_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536
21+
22+
# User provided section
23+
24+
# List of Local paths (relative to this file) that should be
25+
# ignored by the migrate tool.
26+
#
27+
# Files that are not part of the templates will be ignored by default.
28+
unmanaged_files:
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

packages/extension_google_sign_in_as_googleapis_auth/example/android/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx/
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/to/reference-keystore

packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle

Lines changed: 0 additions & 55 deletions
This file was deleted.

packages/google_fonts/example/android/app/build.gradle renamed to packages/extension_google_sign_in_as_googleapis_auth/example/android/app/build.gradle.kts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
plugins {
2-
id "com.android.application"
3-
id "kotlin-android"
2+
id("com.android.application")
3+
id("kotlin-android")
44
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5-
id "dev.flutter.flutter-gradle-plugin"
5+
id("dev.flutter.flutter-gradle-plugin")
66
}
77

88
android {
9-
namespace = "com.exmaple.example"
9+
namespace = "dev.flutter.extension_google_sign_in_example"
1010
compileSdk = flutter.compileSdkVersion
1111
ndkVersion = flutter.ndkVersion
1212

@@ -19,12 +19,8 @@ android {
1919
jvmTarget = JavaVersion.VERSION_17.toString()
2020
}
2121

22-
sourceSets {
23-
main.java.srcDirs += 'src/main/kotlin'
24-
}
25-
2622
defaultConfig {
27-
applicationId = "com.example.example"
23+
applicationId = "dev.flutter.extension_google_sign_in_example"
2824
minSdk = flutter.minSdkVersion
2925
targetSdk = flutter.targetSdkVersion
3026
versionCode = flutter.versionCode
@@ -33,7 +29,7 @@ android {
3329

3430
buildTypes {
3531
release {
36-
signingConfig = signingConfigs.debug
32+
signingConfig = signingConfigs.getByName("debug")
3733
}
3834
}
3935
}

packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/debug/AndroidManifest.xml

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

packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/AndroidManifest.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2-
<application
3-
android:label="googlesigninexample"
2+
<application
3+
android:label="extension_google_sign_in_example"
4+
android:name="${applicationName}"
45
android:icon="@mipmap/ic_launcher">
56
<activity
67
android:name=".MainActivity"
8+
android:exported="true"
79
android:launchMode="singleTop"
10+
android:taskAffinity=""
811
android:theme="@style/LaunchTheme"
912
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1013
android:hardwareAccelerated="true"
11-
android:exported="true"
1214
android:windowSoftInputMode="adjustResize">
1315
<!-- Specifies an Android theme to apply to this Activity as soon as
1416
the Android process has started. This theme is visible to the user
@@ -29,4 +31,15 @@
2931
android:name="flutterEmbedding"
3032
android:value="2" />
3133
</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.
37+
38+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
39+
<queries>
40+
<intent>
41+
<action android:name="android.intent.action.PROCESS_TEXT"/>
42+
<data android:mimeType="text/plain"/>
43+
</intent>
44+
</queries>
3245
</manifest>

packages/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/MainActivity.java

Lines changed: 0 additions & 9 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright 2013 The Flutter Authors
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
package dev.flutter.extension_google_sign_in_example
6+
7+
import io.flutter.embedding.android.FlutterActivity
8+
9+
class MainActivity : FlutterActivity()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
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.
1010
This theme determines the color of the Android Window while your
1111
Flutter UI initializes, as well as behind your Flutter UI while its
1212
running.
13-
13+
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
1515
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
1616
<item name="android:windowBackground">?android:colorBackground</item>

0 commit comments

Comments
 (0)