From 6ef114b5ea763ff63cd766b59e5937828ef53108 Mon Sep 17 00:00:00 2001 From: Petr Kubes Date: Sat, 31 Jan 2026 23:35:25 +0100 Subject: [PATCH 1/4] update hive to hive_ce --- packages/fl_query/example/.metadata | 29 +--- packages/fl_query/example/android/.gitignore | 3 +- .../fl_query/example/android/app/build.gradle | 71 -------- .../example/android/app/build.gradle.kts | 44 +++++ .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 19 ++- .../com/example/example/MainActivity.kt | 6 - .../example/fl_query_example/MainActivity.kt | 5 + .../app/src/profile/AndroidManifest.xml | 3 +- .../fl_query/example/android/build.gradle | 31 ---- .../fl_query/example/android/build.gradle.kts | 24 +++ .../example/android/gradle.properties | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../fl_query/example/android/settings.gradle | 11 -- .../example/android/settings.gradle.kts | 26 +++ packages/fl_query/example/pubspec.lock | 160 +++++++++--------- packages/fl_query/lib/src/core/cache.dart | 2 +- packages/fl_query/lib/src/core/client.dart | 3 +- .../fl_query/lib/src/core/infinite_query.dart | 2 +- packages/fl_query/lib/src/core/query.dart | 2 +- packages/fl_query/pubspec.yaml | 3 +- 21 files changed, 214 insertions(+), 238 deletions(-) delete mode 100644 packages/fl_query/example/android/app/build.gradle create mode 100644 packages/fl_query/example/android/app/build.gradle.kts delete mode 100644 packages/fl_query/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt create mode 100644 packages/fl_query/example/android/app/src/main/kotlin/com/example/fl_query_example/MainActivity.kt delete mode 100644 packages/fl_query/example/android/build.gradle create mode 100644 packages/fl_query/example/android/build.gradle.kts delete mode 100644 packages/fl_query/example/android/settings.gradle create mode 100644 packages/fl_query/example/android/settings.gradle.kts diff --git a/packages/fl_query/example/.metadata b/packages/fl_query/example/.metadata index 083a42e..00b74be 100644 --- a/packages/fl_query/example/.metadata +++ b/packages/fl_query/example/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - channel: stable + revision: "3b62efc2a3da49882f43c372e0bc53daef7295a6" + channel: "stable" project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf + create_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6 + base_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6 - platform: android - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - - platform: ios - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - - platform: linux - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - - platform: macos - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - - platform: web - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - - platform: windows - create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf - base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf + create_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6 + base_revision: 3b62efc2a3da49882f43c372e0bc53daef7295a6 # User provided section diff --git a/packages/fl_query/example/android/.gitignore b/packages/fl_query/example/android/.gitignore index 6f56801..be3943c 100644 --- a/packages/fl_query/example/android/.gitignore +++ b/packages/fl_query/example/android/.gitignore @@ -5,9 +5,10 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/packages/fl_query/example/android/app/build.gradle b/packages/fl_query/example/android/app/build.gradle deleted file mode 100644 index b52183a..0000000 --- a/packages/fl_query/example/android/app/build.gradle +++ /dev/null @@ -1,71 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -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.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion flutter.compileSdkVersion - ndkVersion flutter.ndkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.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. - minSdkVersion flutter.minSdkVersion - targetSdkVersion 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 - } - } -} - -flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/packages/fl_query/example/android/app/build.gradle.kts b/packages/fl_query/example/android/app/build.gradle.kts new file mode 100644 index 0000000..f39aed5 --- /dev/null +++ b/packages/fl_query/example/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.fl_query_example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.fl_query_example" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + 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.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/packages/fl_query/example/android/app/src/debug/AndroidManifest.xml b/packages/fl_query/example/android/app/src/debug/AndroidManifest.xml index 45d523a..399f698 100644 --- a/packages/fl_query/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/fl_query/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/packages/fl_query/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/packages/fl_query/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt deleted file mode 100644 index e793a00..0000000 --- a/packages/fl_query/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/packages/fl_query/example/android/app/src/main/kotlin/com/example/fl_query_example/MainActivity.kt b/packages/fl_query/example/android/app/src/main/kotlin/com/example/fl_query_example/MainActivity.kt new file mode 100644 index 0000000..80128a1 --- /dev/null +++ b/packages/fl_query/example/android/app/src/main/kotlin/com/example/fl_query_example/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.fl_query_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/packages/fl_query/example/android/app/src/profile/AndroidManifest.xml b/packages/fl_query/example/android/app/src/profile/AndroidManifest.xml index 45d523a..399f698 100644 --- a/packages/fl_query/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/fl_query/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/packages/fl_query_hooks/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/packages/fl_query_hooks/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt deleted file mode 100644 index e793a00..0000000 --- a/packages/fl_query_hooks/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/packages/fl_query_hooks/example/android/app/src/main/kotlin/com/example/fl_query_hooks_example/MainActivity.kt b/packages/fl_query_hooks/example/android/app/src/main/kotlin/com/example/fl_query_hooks_example/MainActivity.kt new file mode 100644 index 0000000..ed9d6e9 --- /dev/null +++ b/packages/fl_query_hooks/example/android/app/src/main/kotlin/com/example/fl_query_hooks_example/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.fl_query_hooks_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/packages/fl_query_hooks/example/android/app/src/profile/AndroidManifest.xml b/packages/fl_query_hooks/example/android/app/src/profile/AndroidManifest.xml index 45d523a..399f698 100644 --- a/packages/fl_query_hooks/example/android/app/src/profile/AndroidManifest.xml +++ b/packages/fl_query_hooks/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +