Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade packages for Apple Privacy Manifest #1570

Merged
merged 28 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1462d52
Upgrade Firebase packages
nilsreichardt Apr 28, 2024
4bf80cd
Migrate to `share_plus`
nilsreichardt Apr 28, 2024
fd0b52f
Upgrade `device_info_plus`
nilsreichardt Apr 28, 2024
d921b1c
Upgrade file_picker
nilsreichardt Apr 28, 2024
bc5c562
Upgrade image_picker
nilsreichardt Apr 28, 2024
5536d6d
Upgrade `google_sign_in`
nilsreichardt Apr 28, 2024
7cab843
Upgrade `package_info_plus`
nilsreichardt Apr 28, 2024
5dd1156
Upgrade `path_provider`
nilsreichardt Apr 28, 2024
2d1d09d
Upgrade `shared_preferences`
nilsreichardt Apr 28, 2024
58c29c5
Upgrade `url_launcher` and `video_player`
nilsreichardt Apr 28, 2024
c051b63
Upgrade `chewie`
nilsreichardt Apr 28, 2024
57e280e
Run pub get
nilsreichardt Apr 28, 2024
865ffec
Upgrade `firebase_performance`
nilsreichardt Apr 28, 2024
6c18056
Update mocks
nilsreichardt Apr 28, 2024
c9a4583
Upgrade generated code
nilsreichardt Apr 28, 2024
7374200
Upgrade goldens
nilsreichardt Apr 28, 2024
0484b78
Upgrade mobile_scanner
nilsreichardt Apr 28, 2024
1021fc2
pub get upgrade
nilsreichardt Apr 28, 2024
f7f568e
Fix golden test
nilsreichardt Apr 28, 2024
b2ae71f
Apply migration of "Deprecated imperative apply of Flutter's Gradle p…
nilsreichardt Apr 28, 2024
b1199f3
Update pods
nilsreichardt Apr 28, 2024
707cb49
Merge branch 'main' into upgrade-packages
nilsreichardt Apr 28, 2024
b7b588a
Upgrade to Gradle v8
nilsreichardt Apr 29, 2024
68cc883
Revert "Upgrade to Gradle v8"
nilsreichardt Apr 29, 2024
b8c16d5
Migrate to Gradle v8
nilsreichardt Apr 29, 2024
d0c9833
Install Java 17 in CI
nilsreichardt Apr 29, 2024
8ea3d7c
Upgrade Codemagic CLI Tools
nilsreichardt Apr 29, 2024
b3d20eb
Format files
nilsreichardt Apr 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
id 'com.google.gms.google-services'
id 'com.google.firebase.crashlytics'
id 'com.google.firebase.firebase-perf'
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,16 +15,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystorePropertiesFile = rootProject.file("key.properties")
def keystoreProperties = new Properties()
def hasKeystorePropertiesFile = keystorePropertiesFile.exists()
Expand Down Expand Up @@ -113,8 +112,6 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// These dependencies are required for Flutter integration tests, which run
// on Firebase Test Lab. Copied these steps from:
// https://github.com/flutter/flutter/tree/master/packages/integration_test
Expand Down
18 changes: 0 additions & 18 deletions app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
buildscript {
ext.kotlin_version = '1.9.0'

repositories {
google()
mavenCentral()
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.google.gms:google-services:4.3.15'

classpath 'com.google.firebase:perf-plugin:1.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
}
}

allprojects {
repositories {
google()
Expand Down
33 changes: 23 additions & 10 deletions app/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()

def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) {
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

plugins.each { name, path ->
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
include ":$name"
project(":$name").projectDir = pluginDirectory
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
id "com.google.gms.google-services" version "4.4.0" apply false
id "com.google.firebase.crashlytics" version "2.9.9" apply false
id "com.google.firebase.firebase-perf" version "1.4.2" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion app/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
flutter_ios_podfile_setup

target 'Runner' do
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.20.0'
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.24.0'

use_frameworks!
use_modular_headers!
Expand Down
Loading
Loading