diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env index 0ec87bb48..16765a3a5 100644 --- a/.github/workflows/versions.env +++ b/.github/workflows/versions.env @@ -1,2 +1,2 @@ -FLUTTER_VERSION=3.29.2 +FLUTTER_VERSION=3.27.4 JAVA_VERSION=17 diff --git a/android/app/build.gradle b/android/app/build.gradle index bb8e015cd..86e9f5e5e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -30,7 +30,7 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdk = 35 + compileSdkVersion 34 namespace = "chat.fluffy.fluffychat" sourceSets { @@ -44,7 +44,7 @@ android { defaultConfig { applicationId "chat.fluffy.fluffychat" minSdkVersion 21 - targetSdkVersion 35 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -67,8 +67,6 @@ android { versionNameSuffix "-debug" } release { - minifyEnabled false - shrinkResources false signingConfig signingConfigs.release } } @@ -79,19 +77,8 @@ android { pickFirst 'lib/armeabi-v7a/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 { source '../..' } @@ -99,7 +86,6 @@ flutter { 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 'androidx.multidex:multidex:2.0.1' - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") } configurations.all { diff --git a/android/gradle.properties b/android/gradle.properties index 975e44b52..94adc3a3f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,3 @@ -org.gradle.jvmargs=-Xmx4608m +org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -kotlin.jvm.target.validation.mode=IGNORE \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e33907ed2..aeaff6f86 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 17 08:36:03 CET 2025 +#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index dc540c56c..750c82f2c 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.7.3" apply false + id "com.android.application" version "7.3.1" 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 } diff --git a/pubspec.lock b/pubspec.lock index 655785cc5..a373863fe 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -556,34 +556,26 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: d59eeafd6df92174b1d5f68fc9d66634c97ce2e7cfe2293476236547bb19bbbd + sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71" url: "https://pub.dev" source: hosted - version: "19.0.0" + version: "17.2.3" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5 + sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "4.0.1" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c" + sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66" url: "https://pub.dev" source: hosted - 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" + version: "7.2.0" flutter_localizations: dependency: "direct main" description: flutter @@ -625,10 +617,10 @@ packages: dependency: "direct main" description: name: flutter_openssl_crypto - sha256: "293b4fcda13ab0710645a16e82f3d5b7de19bfc0ab2d06bcdb87637222eda5e1" + sha256: "6dcecf6f7c1804ae6f5d73ee05df8af72ea8133bf2447d25979d739503186c96" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.3.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -1940,10 +1932,10 @@ packages: dependency: transitive description: name: timezone - sha256: ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d + sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" url: "https://pub.dev" source: hosted - version: "0.10.0" + version: "0.9.4" tint: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b46aab82f..8411d5fb7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,13 +33,13 @@ dependencies: flutter_foreground_task: ^6.1.3 flutter_highlighter: ^0.1.1 flutter_linkify: ^6.0.0 - flutter_local_notifications: ^19.0.0 + flutter_local_notifications: ^17.2.3 flutter_localizations: sdk: flutter flutter_map: ^6.1.0 flutter_new_badger: ^1.1.1 flutter_olm: 2.0.0 - flutter_openssl_crypto: ^0.5.0 + flutter_openssl_crypto: ^0.3.0 flutter_secure_storage: ^9.2.2 flutter_shortcuts_new: ^2.0.0 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 ref: 3.x-without-v1 path: flutter_web_auth_2 - win32: 5.5.3 \ No newline at end of file + win32: 5.5.3 diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index 14101ede0..c56444146 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -1,5 +1,5 @@ diff --git a/android/app/build.gradle b/android/app/build.gradle -index bb8e015cd..3ff4a7579 100644 +index f92f73f3..6d389efb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -2,7 +2,7 @@ plugins { @@ -11,15 +11,13 @@ index bb8e015cd..3ff4a7579 100644 } def localProperties = new Properties() -@@ -97,11 +97,12 @@ flutter { +@@ -83,10 +83,10 @@ flutter { } 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 'androidx.multidex:multidex:2.0.1' - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") } configurations.all { @@ -99,7 +97,7 @@ index b2fd960a..fdb01a4d 100644 +++ b/android/settings.gradle @@ -20,7 +20,7 @@ plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.7.3" apply false + id "com.android.application" version "7.3.1" 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 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7aa1d882c..baf96d923 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -63,7 +63,7 @@ parts: flutter-git: source: https://github.com/flutter/flutter.git - source-tag: 3.29.2 + source-tag: 3.27.4 plugin: nil override-build: | set -eux diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index d2a3efb85..aefa9bf6e 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,37 +3,36 @@ # list(APPEND FLUTTER_PLUGIN_LIST - app_links - desktop_drop - dynamic_color - emoji_picker_flutter - file_selector_windows - flutter_secure_storage_windows - flutter_webrtc - geolocator_windows - pasteboard - permission_handler_windows - record_windows - share_plus - sqlcipher_flutter_libs - url_launcher_windows - window_to_front + app_links + desktop_drop + dynamic_color + emoji_picker_flutter + file_selector_windows + flutter_secure_storage_windows + flutter_webrtc + geolocator_windows + pasteboard + permission_handler_windows + record_windows + share_plus + sqlcipher_flutter_libs + url_launcher_windows + window_to_front ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - flutter_local_notifications_windows ) set(PLUGIN_BUNDLED_LIBRARIES) -foreach (plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach (plugin) +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) -foreach (ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach (ffi_plugin) +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin)