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

[mob][photos] Upgrade flutter #1434

Merged
merged 32 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6e4db6c
add cast to dependencies and update flutter
ashilkn Mar 28, 2024
dabda8e
upgrade photo_manager and flutter
ashilkn Mar 28, 2024
fa304aa
upgrade flutter version
ashilkn Mar 28, 2024
9f22882
override ffi dependency version to fix build failing after running fl…
ashilkn Mar 28, 2024
4c73fb7
Specify color for dividers to keep it same after flutter upgrade
ashilkn Mar 28, 2024
b976d30
fix colours in new material 3 toggle switch
ashilkn Mar 28, 2024
e3bb6a2
Resolve merge conflicts and merge main
ashilkn Apr 10, 2024
0e9db08
pub upgrade changes
ashilkn Apr 10, 2024
a67da81
fix breaking change
ashilkn Apr 10, 2024
6607fce
fix not building on iOS
ashilkn Apr 10, 2024
8137825
fix: explicitly add fill colour for textFields with filled flag set t…
ashilkn Apr 12, 2024
04e45b7
fix: call updateEmail after initState to avoid runtime exception
ashilkn Apr 13, 2024
372ced2
[mob] fix colour of loading dialog
ashilkn Apr 13, 2024
2c0148d
[mob] fix UI of toggle widget on iOS
ashilkn Apr 13, 2024
75dd7c3
[mob] make function private
ashilkn Apr 13, 2024
d864aca
[mob] Upgrade to flutter 3.19.5
ua741 Apr 12, 2024
9522854
Flutter gradle plugin changes
ua741 Apr 12, 2024
c183531
Switch to older version of share_plus
ua741 Apr 12, 2024
2feee2c
[mob][photos] Bump flutter version in README and github workflow
ua741 Apr 13, 2024
a3f102c
[mob] Use custom toggle widget to remove UI issues after migrating to…
ashilkn Apr 13, 2024
ab70908
Merge branch 'update_deps_and_flutter' of https://github.com/ente-io/…
ua741 Apr 13, 2024
4c93033
[mob] Upgrade sqflite_async
ua741 Apr 13, 2024
0348e43
Merge branch 'material_3_ui_issues_fix' into update_deps_and_flutter
ashilkn Apr 13, 2024
10cb54d
[mob] Use SegmentedButton instead of broken(UI) toggle in stripe subs…
ashilkn Apr 13, 2024
d35fe3f
[mob] Use SegmentedButton instead of broken(UI) toggle in app store s…
ashilkn Apr 13, 2024
6c75b35
[mob] pub upgrade
ashilkn Apr 13, 2024
81c47bc
[mob] UI changes to segmented button in stripe and store pages
ashilkn Apr 13, 2024
f2987a8
[mob] merge main
ashilkn Apr 13, 2024
c3de396
[mob] bump up version to v0.8.80
ashilkn Apr 13, 2024
2c07772
[mob][photos] Cleanup android/build.gradle
ua741 Apr 15, 2024
2ee7921
[mob][photos] Update doc for ffi override
ua741 Apr 15, 2024
092fe5c
[mob][photos] Upgrade freeze and generated files (#1445)
ua741 Apr 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/mobile-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- ".github/workflows/mobile-lint.yml"

env:
FLUTTER_VERSION: "3.13.4"
FLUTTER_VERSION: "3.19.5"

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "photos-v*"

env:
FLUTTER_VERSION: "3.13.4"
FLUTTER_VERSION: "3.19.5"

jobs:
build:
Expand Down
76 changes: 38 additions & 38 deletions auth/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ packages:
dependency: transitive
description:
name: args
sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
url: "https://pub.dev"
source: hosted
version: "2.4.2"
version: "2.5.0"
async:
dependency: transitive
description:
Expand Down Expand Up @@ -157,10 +157,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e
sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
url: "https://pub.dev"
source: hosted
version: "8.9.1"
version: "8.9.2"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -318,10 +318,10 @@ packages:
dependency: "direct main"
description:
name: dio
sha256: "0978e9a3e45305a80a7210dbeaf79d6ee8bee33f70c8e542dc654c952070217f"
sha256: "639179e1cc0957779e10dd5b786ce180c477c4c0aca5aaba5d1700fa2e834801"
url: "https://pub.dev"
source: hosted
version: "5.4.2+1"
version: "5.4.3"
dotted_border:
dependency: "direct main"
description:
Expand Down Expand Up @@ -586,10 +586,10 @@ packages:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f"
url: "https://pub.dev"
source: hosted
version: "2.0.17"
version: "2.0.19"
flutter_secure_storage:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1053,18 +1053,18 @@ packages:
dependency: "direct main"
description:
name: path_provider
sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.3"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
url: "https://pub.dev"
source: hosted
version: "2.2.2"
version: "2.2.4"
path_provider_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -1133,10 +1133,10 @@ packages:
dependency: "direct main"
description:
name: pointycastle
sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
url: "https://pub.dev"
source: hosted
version: "3.7.4"
version: "3.8.0"
pool:
dependency: transitive
description:
Expand Down Expand Up @@ -1221,18 +1221,18 @@ packages:
dependency: "direct main"
description:
name: sentry
sha256: a460aa48568d47140dd0557410b624d344ffb8c05555107ac65035c1097cf1ad
sha256: fe99a06970b909a491b7f89d54c9b5119772e3a48a400308a6e129625b333f5b
url: "https://pub.dev"
source: hosted
version: "7.18.0"
version: "7.19.0"
sentry_flutter:
dependency: "direct main"
description:
name: sentry_flutter
sha256: "3d0d1d4e0e407d276ae8128d123263ccbc37e988bae906765efd6f37d544f4c6"
sha256: fc013d4a753447320f62989b1871fdc1f20c77befcc8be3e38774dd7402e7a62
url: "https://pub.dev"
source: hosted
version: "7.18.0"
version: "7.19.0"
share_plus:
dependency: "direct main"
description:
Expand All @@ -1253,18 +1253,18 @@ packages:
dependency: "direct main"
description:
name: shared_preferences
sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
url: "https://pub.dev"
source: hosted
version: "2.2.2"
version: "2.2.3"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
sha256: "1ee8bf911094a1b592de7ab29add6f826a7331fb854273d55918693d5364a1f2"
url: "https://pub.dev"
source: hosted
version: "2.2.1"
version: "2.2.2"
shared_preferences_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -1387,10 +1387,10 @@ packages:
description:
path: sqflite
ref: HEAD
resolved-ref: "075b3e2f81e691a19a500e7ff6db2953de7f83a9"
resolved-ref: f281785e12e8b1abf2f9d41a587fc83d810724cf
url: "https://github.com/tekartik/sqflite"
source: git
version: "2.3.2"
version: "2.3.3"
sqflite_common:
dependency: transitive
description:
Expand All @@ -1411,10 +1411,10 @@ packages:
dependency: "direct main"
description:
name: sqlite3
sha256: "072128763f1547e3e9b4735ce846bfd226d68019ccda54db4cd427b12dfdedc9"
sha256: "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.4.2"
sqlite3_flutter_libs:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1515,10 +1515,10 @@ packages:
dependency: "direct main"
description:
name: tray_manager
sha256: "4ab709d70a4374af172f8c39e018db33a4271265549c6fc9d269a65e5f4b0225"
sha256: e0ac9a88b2700f366b8629b97e8663b6ef450a2f169560a685dc167bfe9c9c29
url: "https://pub.dev"
source: hosted
version: "0.2.1"
version: "0.2.2"
tuple:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1547,18 +1547,18 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e"
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
url: "https://pub.dev"
source: hosted
version: "6.2.5"
version: "6.2.6"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745
sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775"
url: "https://pub.dev"
source: hosted
version: "6.3.0"
version: "6.3.1"
url_launcher_ios:
dependency: transitive
description:
Expand Down Expand Up @@ -1611,10 +1611,10 @@ packages:
dependency: "direct main"
description:
name: uuid
sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8
sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
url: "https://pub.dev"
source: hosted
version: "4.3.3"
version: "4.4.0"
vector_graphics:
dependency: transitive
description:
Expand Down Expand Up @@ -1675,18 +1675,18 @@ packages:
dependency: transitive
description:
name: web_socket_channel
sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2"
sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
url: "https://pub.dev"
source: hosted
version: "2.4.4"
version: "2.4.5"
win32:
dependency: "direct main"
description:
name: win32
sha256: "8cb58b45c47dcb42ab3651533626161d6b67a2921917d8d429791f76972b3480"
sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
url: "https://pub.dev"
source: hosted
version: "5.3.0"
version: "5.4.0"
win32_registry:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion mobile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ You can alternatively install the build from PlayStore or F-Droid.

## 🧑‍💻 Building from source

1. [Install Flutter v3.13.4](https://flutter.dev/docs/get-started/install).
1. [Install Flutter v3.19.5](https://flutter.dev/docs/get-started/install).

2. Pull in all submodules with `git submodule update --init --recursive`

Expand Down
16 changes: 6 additions & 10 deletions mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
ua741 marked this conversation as resolved.
Show resolved Hide resolved
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -21,10 +21,6 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

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

def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
Expand Down Expand Up @@ -126,7 +122,7 @@ flutter {

dependencies {
implementation 'io.sentry:sentry-android:2.0.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21"
implementation 'com.android.support:multidex:1.0.3'
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
testImplementation 'junit:junit:4.12'
Expand Down
15 changes: 2 additions & 13 deletions mobile/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
buildscript {
ext.kotlin_version = '1.8.21'
repositories {
google()
jcenter()
}

ext.appCompatVersion = '1.1.0' // for background_fetch

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:7.1.2' // for background_fetch
}
ext {
appCompatVersion = '1.1.0' // for background_fetch
}

allprojects {
Expand Down
30 changes: 20 additions & 10 deletions mobile/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
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.1.2" apply false
id "org.jetbrains.kotlin.android" version "1.8.21" apply false
}

include ":app"
Loading