Merge pull request #22 from bhargavraviya/main

upgrade flutter version

.gitignore

@@ -32,9 +32,6 @@ migrate_working_dir/
 .pub/
 /build/
 
-# Web related
-lib/generated_plugin_registrant.dart
-
 # Symbolication related
 app.*.symbols
 
@@ -45,4 +42,3 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-

.metadata

@@ -1,26 +1,26 @@
 # 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: cd41fdd495f6944ecd3506c21e94c6567b073278
- channel: stable
+ revision: "2f708eb8396e362e280fac22cf171c2cb467343c"
+ channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
  platforms:
  - platform: root
- create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
- base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+ create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
+ base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
  - platform: android
- create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
- base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+ create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
+ base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
  - platform: ios
- create_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
- base_revision: cd41fdd495f6944ecd3506c21e94c6567b073278
+ create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
+ base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
 
  # User provided section
 
@@ -31,4 +31,3 @@ migration:
  unmanaged_files:
  - 'lib/main.dart'
  - 'ios/Runner.xcodeproj/project.pbxproj'
-

analysis_options.yaml

@@ -1,30 +1 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
-
-linter:
- # The lint rules applied to this project can be customized in the
- # section below to disable rules from the `package:flutter_lints/flutter.yaml`
- # included above or to enable additional rules. A list of all available lints
- # and their documentation is published at
- # https://dart-lang.github.io/linter/lints/index.html.
- #
- # Instead of disabling a lint rule for the entire project in the
- # section below, it can also be suppressed for a single line of code
- # or a specific dart file by using the `// ignore: name_of_lint` and
- # `// ignore_for_file: name_of_lint` syntax on the line or in the file
- # producing the lint.
- rules:
- # avoid_print: false # Uncomment to disable the `avoid_print` rule
- # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
-

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,12 +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'
@@ -22,12 +22,9 @@ 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.example.flappy_bird"
+ compileSdkVersion flutter.compileSdkVersion
  ndkVersion flutter.ndkVersion
 
  compileOptions {
@@ -47,8 +44,8 @@ android {
  // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
  applicationId "com.example.flappy_bird"
  // You can update the following values to match your application needs.
- // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
- minSdkVersion 19
+ // 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
@@ -67,6 +64,4 @@ flutter {
  source '../..'
 }
 
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+dependencies {}

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.flappy_bird">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
  <!-- The INTERNET permission is required for development. Specifically,
  the Flutter tool needs it to communicate with the running application
  to allow setting breakpoints, to provide hot reload, etc.

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.flappy_bird">
- <application
- android:label="Flappy Bird"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+ <application
+ android:label="flappy_bird"
  android:name="${applicationName}"
  android:icon="@mipmap/ic_launcher">
  <activity

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.7.10'
  repositories {
  google()
  mavenCentral()
  }
 
  dependencies {
- classpath 'com.android.tools.build:gradle:7.1.2'
+ classpath 'com.android.tools.build:gradle:7.3.0'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
  }
 }
@@ -26,6 +26,6 @@ subprojects {
  project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
  delete rootProject.buildDir
 }

android/settings.gradle

@@ -1,11 +1,20 @@
-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
+ }
+ settings.ext.flutterSdkPath = flutterSdkPath()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+ includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+ plugins {
+ id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+ }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ":app"
+
+apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"

ios/Flutter/AppFrameworkInfo.plist

@@ -21,8 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
- <string>9.0</string>
+ <string>11.0</string>
 </dict>
 </plist>
-
-