Skip to content

Commit

Permalink
chore(cloud_firestore): upgrade gradle (#12875)
Browse files Browse the repository at this point in the history
* chore(cloud_firestore): upgrade gradle

* remove todo

* revert gradle url

---------

Co-authored-by: Russell Wheatley <russellwheatley85@gmail.com>
  • Loading branch information
TarekkMA and russellwheatley committed Jun 3, 2024
1 parent f67914c commit e6069b3
Show file tree
Hide file tree
Showing 14 changed files with 196 additions and 75 deletions.
24 changes: 22 additions & 2 deletions packages/cloud_firestore/cloud_firestore/example/.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,27 @@
# This file should be version controlled and should not be manually edited.

version:
revision: 7e9793dee1b85a243edd0e06cb1658e98b077561
channel: stable
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
- platform: android
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1

# User provided section

# List of Local paths (relative to this file) that should be
# ignored by the migrate tool.
#
# Files that are not part of the templates will be ignored by default.
unmanaged_files:
- 'lib/main.dart'
- 'ios/Runner.xcodeproj/project.pbxproj'
Original file line number Diff line number Diff line change
@@ -1,66 +1,60 @@
plugins {
id "com.android.application"
// START: FlutterFire Configuration
id 'com.google.gms.google-services'
// END: FlutterFire Configuration
id "kotlin-android"
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
id "com.google.gms.google-services"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
def localPropertiesFile = rootProject.file("local.properties")
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader('UTF-8') { reader ->
localPropertiesFile.withReader("UTF-8") { reader ->
localProperties.load(reader)
}
}


def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
if (flutterVersionCode == null) {
flutterVersionCode = '1'
flutterVersionCode = "1"
}

def flutterVersionName = localProperties.getProperty('flutter.versionName')
def flutterVersionName = localProperties.getProperty("flutter.versionName")
if (flutterVersionName == null) {
flutterVersionName = '1.0'
flutterVersionName = "1.0"
}


android {
namespace 'io.flutter.plugins.firebase.firestore.example'

compileSdk 34

defaultConfig {
applicationId "io.flutter.plugins.firebase.firestore.example"
minSdk 21
targetSdk 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
namespace = "io.flutter.plugins.firebase.firestore.example"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
defaultConfig {
applicationId = "io.flutter.plugins.firebase.firestore.example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
signingConfig = signingConfigs.debug
}
}
}

flutter {
source '../..'
source = "../.."
}

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,42 @@
"storage_bucket": "flutterfire-e2e-tests.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:d86a91cc7b338b233574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebase.analytics.example"
}
},
"oauth_client": [
{
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCdRjCVZlhrq72RuEklEyyxYlBRCYhI2Sw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:a241c4b471513a203574d0",
Expand Down Expand Up @@ -50,6 +86,58 @@
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:21d5142deea38dda3574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebase.auth.example"
}
},
"oauth_client": [
{
"client_id": "406099696497-emmujnd7g2ammh5uu9ni6v04p4ateqac.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "io.flutter.plugins.firebase.auth.example",
"certificate_hash": "5ad0d6d5cbe577ca185b8df246656bebc3957128"
}
},
{
"client_id": "406099696497-in8bfp0nali85oul1o98huoar6eo1vv1.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "io.flutter.plugins.firebase.auth.example",
"certificate_hash": "909ca1482ef022bbae45a2db6b6d05d807a4c4aa"
}
},
{
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCdRjCVZlhrq72RuEklEyyxYlBRCYhI2Sw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "406099696497-0mofiof3ofcgmpmirb6q0fllvb372sme.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "io.flutter.plugins.firebase.example"
}
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:3ef965ff044efc0b3574d0",
Expand Down Expand Up @@ -212,9 +300,9 @@
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0",
"mobilesdk_app_id": "1:406099696497:android:6d1c1fbf4688f39c3574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebase.messaging.example"
"package_name": "io.flutter.plugins.firebase.installations.example"
}
},
"oauth_client": [
Expand Down Expand Up @@ -248,9 +336,9 @@
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0",
"mobilesdk_app_id": "1:406099696497:android:74ebb073d7727cd43574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebase.tests"
"package_name": "io.flutter.plugins.firebase.messaging.example"
}
},
"oauth_client": [
Expand Down Expand Up @@ -284,20 +372,12 @@
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0",
"mobilesdk_app_id": "1:406099696497:android:f54b85cfa36a39f73574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebase_ui_example"
"package_name": "io.flutter.plugins.firebase.remoteconfig.example"
}
},
"oauth_client": [
{
"client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "io.flutter.plugins.firebase_ui_example",
"certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6"
}
},
{
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
"client_type": 3
Expand Down Expand Up @@ -328,12 +408,28 @@
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:b7a347ba65ca3b803574d0",
"mobilesdk_app_id": "1:406099696497:android:0d4ed619c031c0ac3574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebaseanalyticsexample"
"package_name": "io.flutter.plugins.firebase.tests"
}
},
"oauth_client": [
{
"client_id": "406099696497-ib9hj9281l3343cm3nfvvdotaojrthdc.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "io.flutter.plugins.firebase.tests",
"certificate_hash": "5ad0d6d5cbe577ca185b8df246656bebc3957128"
}
},
{
"client_id": "406099696497-lc54d5l8sp90k39r0bb39ovsgo1s9bek.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "io.flutter.plugins.firebase.tests",
"certificate_hash": "909ca1482ef022bbae45a2db6b6d05d807a4c4aa"
}
},
{
"client_id": "406099696497-a12gakvts4epfk5pkio7dphc1anjiggc.apps.googleusercontent.com",
"client_type": 3
Expand Down Expand Up @@ -364,17 +460,17 @@
},
{
"client_info": {
"mobilesdk_app_id": "1:406099696497:android:61e67dfd35ab93ad3574d0",
"mobilesdk_app_id": "1:406099696497:android:899c6485cfce26c13574d0",
"android_client_info": {
"package_name": "io.flutter.plugins.firebaseauthexample"
"package_name": "io.flutter.plugins.firebase_ui_example"
}
},
"oauth_client": [
{
"client_id": "406099696497-j20pm6c84pofkl1ivo4f7fe797smfnp4.apps.googleusercontent.com",
"client_id": "406099696497-ltgvphphcckosvqhituel5km2k3aecg8.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "io.flutter.plugins.firebaseauthexample",
"package_name": "io.flutter.plugins.firebase_ui_example",
"certificate_hash": "a4256c0612686b336af6d138a5479b7dc1ee1af6"
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.flutter.plugins.firebase.firestore.example">
<!-- Flutter needs it to communicate with the running application
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.flutter.plugins.firebase.firestore.example">
<application
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="example"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:taskAffinity=""
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
Expand All @@ -31,4 +31,15 @@
android:name="flutterEmbedding"
android:value="2" />
</application>
<!-- Required to query activities that can process text, see:
https://developer.android.com/training/package-visibility and
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
<queries>
<intent>
<action android:name="android.intent.action.PROCESS_TEXT"/>
<data android:mimeType="text/plain"/>
</intent>
</queries>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ package io.flutter.plugins.firebase.firestore.example

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity() {
}
class MainActivity: FlutterActivity()
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
Flutter draws its first frame -->
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
Flutter draws its first frame -->
the Flutter engine draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
Expand Down
Loading

0 comments on commit e6069b3

Please sign in to comment.