From fae906fa847e42702f41eed9035a6e73256b7446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20Ma=CC=88rz?= Date: Thu, 4 Apr 2024 10:06:45 +0200 Subject: [PATCH] feat(app): update dependencies flutter 3.16.5 --- CHANGELOG.md | 2 + analysis_options.yaml | 4 - android/src/main/AndroidManifest.xml | 3 +- example/.metadata | 29 ++- example/android/app/build.gradle | 41 ++-- .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 22 +- .../quickbirdstudios/example/MainActivity.kt | 3 +- .../survey_kit_example/MainActivity.kt | 6 - .../main/res/xml/network_security_config.xml | 9 - .../app/src/profile/AndroidManifest.xml | 3 +- example/android/build.gradle | 15 +- example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 31 ++- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Podfile | 2 +- example/ios/Podfile.lock | 18 +- example/ios/Runner.xcodeproj/project.pbxproj | 8 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/RunnerTests/RunnerTests.swift | 12 ++ .../Flutter/GeneratedPluginRegistrant.swift | 26 --- .../ephemeral/Flutter-Generated.xcconfig | 11 - .../ephemeral/flutter_export_environment.sh | 12 -- example/pubspec.lock | 166 +++++++++------ pubspec.lock | 200 ++++++++++-------- pubspec.yaml | 4 +- 27 files changed, 340 insertions(+), 298 deletions(-) delete mode 100644 example/android/app/src/main/kotlin/com/quickbirdstudios/survey_kit_example/MainActivity.kt delete mode 100644 example/android/app/src/main/res/xml/network_security_config.xml create mode 100644 example/ios/RunnerTests/RunnerTests.swift delete mode 100644 example/macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100644 example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig delete mode 100755 example/macos/Flutter/ephemeral/flutter_export_environment.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index c753d2bd..450a58af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 1.0.0-dev.5 +- INFO: Updated dependencies to latest Flutter Version 3.19.5 # 1.0.0-dev.4 - INFO: Revert intl dependency to 0.18.0 # 1.0.0-dev.3 diff --git a/analysis_options.yaml b/analysis_options.yaml index a2090ccb..f1503474 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -21,7 +21,6 @@ analyzer: linter: rules: - always_declare_return_types - - always_require_non_null_named_parameters - always_use_package_imports - annotate_overrides - avoid_bool_literals_in_conditional_expressions @@ -43,8 +42,6 @@ linter: - avoid_relative_lib_imports - avoid_renaming_method_parameters - avoid_return_types_on_setters - - avoid_returning_null - - avoid_returning_null_for_future - avoid_returning_null_for_void - avoid_returning_this - avoid_setters_without_getters @@ -113,7 +110,6 @@ linter: - prefer_const_literals_to_create_immutables - prefer_constructors_over_static_methods - prefer_contains - - prefer_equal_for_default_values - prefer_final_fields - prefer_final_in_for_each - prefer_final_locals diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 600195e4..56ad8bb7 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/example/.metadata b/example/.metadata index 1e2a1703..24a13c13 100644 --- a/example/.metadata +++ b/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: 135454af32477f815a7525073027a3ff9eff1bfd - channel: stable + revision: "bae5e49bc2a867403c43b2aae2de8f8c33b037e4" + channel: "stable" project_type: app @@ -13,11 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 - platform: android - create_revision: 135454af32477f815a7525073027a3ff9eff1bfd - base_revision: 135454af32477f815a7525073027a3ff9eff1bfd + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + - platform: ios + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + - platform: linux + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + - platform: macos + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + - platform: web + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + - platform: windows + create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 + base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4 # User provided section diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 794e4b96..5eb12c4f 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,9 @@ +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()) { @@ -6,11 +12,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.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,12 +22,19 @@ 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 33 + namespace "com.quickbirdstudios.example" + compileSdk 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' @@ -34,11 +42,14 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.quickbirdstudios.surveykit_example" - minSdkVersion 21 - targetSdkVersion 33 + applicationId "com.quickbirdstudios.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 + multiDexEnabled true } buildTypes { @@ -54,6 +65,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index ce6a134d..399f6981 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/example/android/app/src/main/kotlin/com/quickbirdstudios/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/quickbirdstudios/example/MainActivity.kt index 76f16e4f..d49bac85 100644 --- a/example/android/app/src/main/kotlin/com/quickbirdstudios/example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/quickbirdstudios/example/MainActivity.kt @@ -2,5 +2,4 @@ package com.quickbirdstudios.example import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity: FlutterActivity() diff --git a/example/android/app/src/main/kotlin/com/quickbirdstudios/survey_kit_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/quickbirdstudios/survey_kit_example/MainActivity.kt deleted file mode 100644 index 95b351de..00000000 --- a/example/android/app/src/main/kotlin/com/quickbirdstudios/survey_kit_example/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.quickbirdstudios.survey_kit_example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/example/android/app/src/main/res/xml/network_security_config.xml b/example/android/app/src/main/res/xml/network_security_config.xml deleted file mode 100644 index bb6ab93d..00000000 --- a/example/android/app/src/main/res/xml/network_security_config.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml index ce6a134d..399f6981 100644 --- a/example/android/app/src/profile/AndroidManifest.xml +++ b/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +