2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Update flutter 3.29.2

Browse source 
Signed-off-by: Krille <c.kussowski@famedly.com>
This commit is contained in:
krille-chan 2025-03-03 18:03:11 +01:00 • committed by Krille
commit bfd23952b7
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
10 changed files with 76 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/versions.env vendored
View file

@ -1,2 +1,2 @@
FLUTTER_VERSION=3.27.4 FLUTTER_VERSION=3.29.2
JAVA_VERSION=17 JAVA_VERSION=17

18
android/app/build.gradle
View file

@ -30,7 +30,7 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdkVersion 34 compileSdk = 35
namespace = "chat.fluffy.fluffychat" namespace = "chat.fluffy.fluffychat"
sourceSets { sourceSets {
@ -44,7 +44,7 @@ android {
defaultConfig { defaultConfig {
applicationId "chat.fluffy.fluffychat" applicationId "chat.fluffy.fluffychat"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 34 targetSdkVersion 35
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -67,6 +67,8 @@ android {
versionNameSuffix "-debug" versionNameSuffix "-debug"
} }
release { release {
minifyEnabled false
shrinkResources false
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }
@ -77,8 +79,19 @@ android {
pickFirst 'lib/armeabi-v7a/libc++_shared.so' pickFirst 'lib/armeabi-v7a/libc++_shared.so'
pickFirst 'lib/arm64-v8a/libc++_shared.so' pickFirst 'lib/arm64-v8a/libc++_shared.so'
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
coreLibraryDesugaringEnabled true
}
kotlinOptions {
jvmTarget = "17"
}
} }
flutter { flutter {
source '../..' source '../..'
} }
@ -86,6 +99,7 @@ flutter {
dependencies { dependencies {
//implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
} }
configurations.all { configurations.all {

3
android/gradle.properties
View file

@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx4608m
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.jvm.target.validation.mode=IGNORE

4
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Jun 23 08:50:38 CEST 2017 #Mon Mar 17 08:36:03 CET 2025
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip

2
android/settings.gradle
View file

@ -18,7 +18,7 @@ pluginManagement {
plugins { plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.1" apply false id "com.android.application" version "8.7.3" apply false
id "org.jetbrains.kotlin.android" version "2.1.10" apply false id "org.jetbrains.kotlin.android" version "2.1.10" apply false
// id "com.google.gms.google-services" version "4.3.8" apply false // id "com.google.gms.google-services" version "4.3.8" apply false
} }

28
pubspec.lock
View file

@ -556,26 +556,34 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_local_notifications name: flutter_local_notifications
sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71" sha256: d59eeafd6df92174b1d5f68fc9d66634c97ce2e7cfe2293476236547bb19bbbd
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "17.2.3" version: "19.0.0"
flutter_local_notifications_linux: flutter_local_notifications_linux:
dependency: transitive dependency: transitive
description: description:
name: flutter_local_notifications_linux name: flutter_local_notifications_linux
sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.0.1" version: "6.0.0"
flutter_local_notifications_platform_interface: flutter_local_notifications_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: flutter_local_notifications_platform_interface name: flutter_local_notifications_platform_interface
sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66" sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.2.0" version: "9.0.0"
flutter_local_notifications_windows:
dependency: transitive
description:
name: flutter_local_notifications_windows
sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
url: "https://pub.dev"
source: hosted
version: "1.0.0"
flutter_localizations: flutter_localizations:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -617,10 +625,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_openssl_crypto name: flutter_openssl_crypto
sha256: "6dcecf6f7c1804ae6f5d73ee05df8af72ea8133bf2447d25979d739503186c96" sha256: "293b4fcda13ab0710645a16e82f3d5b7de19bfc0ab2d06bcdb87637222eda5e1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.3.0" version: "0.5.0"
flutter_plugin_android_lifecycle: flutter_plugin_android_lifecycle:
dependency: transitive dependency: transitive
description: description:
@ -1932,10 +1940,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: timezone name: timezone
sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" sha256: ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.9.4" version: "0.10.0"
tint: tint:
dependency: transitive dependency: transitive
description: description:

6
pubspec.yaml
View file

@ -33,13 +33,13 @@ dependencies:
flutter_foreground_task: ^6.1.3 flutter_foreground_task: ^6.1.3
flutter_highlighter: ^0.1.1 flutter_highlighter: ^0.1.1
flutter_linkify: ^6.0.0 flutter_linkify: ^6.0.0
flutter_local_notifications: ^17.2.3 flutter_local_notifications: ^19.0.0
flutter_localizations: flutter_localizations:
sdk: flutter sdk: flutter
flutter_map: ^6.1.0 flutter_map: ^6.1.0
flutter_new_badger: ^1.1.1 flutter_new_badger: ^1.1.1
flutter_olm: 2.0.0 flutter_olm: 2.0.0
flutter_openssl_crypto: ^0.3.0 flutter_openssl_crypto: ^0.5.0
flutter_secure_storage: ^9.2.2 flutter_secure_storage: ^9.2.2
flutter_shortcuts_new: ^2.0.0 flutter_shortcuts_new: ^2.0.0
flutter_typeahead: ## Custom fork from flutter_typeahead since the package is not maintain well. flutter_typeahead: ## Custom fork from flutter_typeahead since the package is not maintain well.
@ -140,4 +140,4 @@ dependency_overrides:
url: https://github.com/ThexXTURBOXx/flutter_web_auth_2.git url: https://github.com/ThexXTURBOXx/flutter_web_auth_2.git
ref: 3.x-without-v1 ref: 3.x-without-v1
path: flutter_web_auth_2 path: flutter_web_auth_2
win32: 5.5.3 win32: 5.5.3

10
scripts/enable-android-google-services.patch
View file

@ -1,5 +1,5 @@
diff --git a/android/app/build.gradle b/android/app/build.gradle diff --git a/android/app/build.gradle b/android/app/build.gradle
index f92f73f3..6d389efb 100644 index bb8e015cd..3ff4a7579 100644
--- a/android/app/build.gradle --- a/android/app/build.gradle
+++ b/android/app/build.gradle +++ b/android/app/build.gradle
@@ -2,7 +2,7 @@ plugins { @@ -2,7 +2,7 @@ plugins {
@ -11,13 +11,15 @@ index f92f73f3..6d389efb 100644
} }
def localProperties = new Properties() def localProperties = new Properties()
@@ -83,10 +83,10 @@ flutter { @@ -97,11 +97,12 @@ flutter {
} }
dependencies { dependencies {
- //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 - //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
+ implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 + implementation 'com.google.firebase:firebase-messaging:19.0.1'
+ // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
} }
configurations.all { configurations.all {
@ -97,7 +99,7 @@ index b2fd960a..fdb01a4d 100644
+++ b/android/settings.gradle +++ b/android/settings.gradle
@@ -20,7 +20,7 @@ plugins { @@ -20,7 +20,7 @@ plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.1" apply false id "com.android.application" version "8.7.3" apply false
id "org.jetbrains.kotlin.android" version "2.1.10" apply false id "org.jetbrains.kotlin.android" version "2.1.10" apply false
- // id "com.google.gms.google-services" version "4.3.8" apply false - // id "com.google.gms.google-services" version "4.3.8" apply false
+ id "com.google.gms.google-services" version "4.3.8" apply false + id "com.google.gms.google-services" version "4.3.8" apply false

2
snap/snapcraft.yaml
View file

@ -63,7 +63,7 @@ parts:
flutter-git: flutter-git:
source: https://github.com/flutter/flutter.git source: https://github.com/flutter/flutter.git
source-tag: 3.27.4 source-tag: 3.29.2
plugin: nil plugin: nil
override-build: | override-build: |
set -eux set -eux

51
windows/flutter/generated_plugins.cmake
View file

@ -3,36 +3,37 @@
# #
list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_PLUGIN_LIST
app_links app_links
desktop_drop desktop_drop
dynamic_color dynamic_color
emoji_picker_flutter emoji_picker_flutter
file_selector_windows file_selector_windows
flutter_secure_storage_windows flutter_secure_storage_windows
flutter_webrtc flutter_webrtc
geolocator_windows geolocator_windows
pasteboard pasteboard
permission_handler_windows permission_handler_windows
record_windows record_windows
share_plus share_plus
sqlcipher_flutter_libs sqlcipher_flutter_libs
url_launcher_windows url_launcher_windows
window_to_front window_to_front
) )
list(APPEND FLUTTER_FFI_PLUGIN_LIST list(APPEND FLUTTER_FFI_PLUGIN_LIST
flutter_local_notifications_windows
) )
set(PLUGIN_BUNDLED_LIBRARIES) set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST}) foreach (plugin ${FLUTTER_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>) list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin) endforeach (plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) foreach (ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin) endforeach (ffi_plugin)