Merge pull request #340 from LittleLightForDestiny/flutter_upgrade

upgrade flutter to 3.22

.github/workflows/publish-google-play.yml

@@ -68,7 +68,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.16.5"
+          flutter-version: "3.22.1"
 
       - name: Create assets/_env
         run: |

.github/workflows/publish-ios.yml

@@ -114,7 +114,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.16.5"
+          flutter-version: "3.22.1"
 
       - name: Create assets/_env
         run: |

.github/workflows/publish-macos.yml

@@ -114,7 +114,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.16.5"
+          flutter-version: "3.22.1"
 
       - name: Create assets/_env
         run: |

.github/workflows/publish-windows.yml

@@ -58,14 +58,14 @@ jobs:
 
       - name: Setup MS Store Developer CLI
         uses: microsoft/setup-msstore-cli@v1
-      
+
       - name: Configure MS Store credentials
         run: msstore reconfigure --tenantId ${{ secrets.AZURE_AD_TENANT_ID }} --clientId ${{ secrets.AZURE_AD_CLIENT_ID }} --clientSecret ${{ secrets.AZURE_AD_CLIENT_SECRET }} --sellerId ${{ secrets.MS_STORE_SELLER_ID }}
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.16.5"
+          flutter-version: "3.22.1"
 
       - name: Create assets/_env
         shell: bash
@@ -81,7 +81,7 @@ jobs:
 
       - name: Download pub dependencies
         run: flutter pub get
-      
+
       - name: Build via Flutter
         run: flutter build windows --release
 
@@ -95,16 +95,16 @@ jobs:
         if: steps.variables.outputs.version != ''
         uses: thedoctor0/[email protected]
         with:
-          type: 'zip'
-          filename: 'LittleLight-windows-${{ steps.variables.outputs.version }}.zip'
+          type: "zip"
+          filename: "LittleLight-windows-${{ steps.variables.outputs.version }}.zip"
           path: ${{ github.workspace }}/build/windows/x64/runner/Release
 
       - name: Upload build to Github Release
         uses: softprops/action-gh-release@v1
         if: steps.variables.outputs.version != ''
         with:
           tag_name: ${{ steps.variable.outputs.version }}
-          files: 'LittleLight-windows-${{ steps.variables.outputs.version }}.zip'
+          files: "LittleLight-windows-${{ steps.variables.outputs.version }}.zip"
 
       - name: Create MSIX package
         if: steps.variables.outputs.track == 'production'
@@ -113,5 +113,3 @@ jobs:
       - name: Publish MSIX to the Microsoft Store
         if: steps.variables.outputs.track == 'production'
         run: msstore publish -v -i ./build/windows/x64/runner/Release
-
-

.vscode/launch.json

@@ -1,16 +1,23 @@
 {
     "configurations": [
-    {
-        "name": "Flutter",
-        "type": "dart",
-        "request": "launch",
-        "program": "lib/main.dart"
-    },
-    {
-        "name": "LittleLight Dev Mode",
-        "type": "dart",
-        "request": "launch",
-        "program": "lib/dev_mode_main.dart"
-    }
+        {
+            "name": "Debug",
+            "type": "dart",
+            "request": "launch",
+            "program": "lib/main.dart"
+        },
+        {
+            "name": "Profile",
+            "type": "dart",
+            "request": "launch",
+            "program": "lib/main.dart",
+            "flutterMode": "profile",
+        },
+        {
+            "name": "LittleLight Dev Mode",
+            "type": "dart",
+            "request": "launch",
+            "program": "lib/dev_mode_main.dart"
+        }
     ]
 }

README.md

@@ -19,7 +19,7 @@ Right now it features:
 Visit [@LittleLightD2](http://twitter.com/LittleLightD2) or join the [Discord Server](https://discord.gg/ztdFGGz) for updates and more details.
 
 ## Bugs and feature requests
-Have a bug or a feature request? Please first search for [existing and closed issues](https://github.com/LittleLightForDestiny/LittleLight/issues). If your problem or idea is not addressed yet, please open a new issue.
+Have a bug or a feature request? Please first search for [existing and closed issues](https://github.com/LittleLightForDestiny/littlelight/issues). If your problem or idea is not addressed yet, please open a new issue.
 
 ## Support Little Light
 Support Little Light with a [one-time](https://ko-fi.com/littlelight) or [monthly](https://www.patreon.com/littlelightD2) donation and help us continue our active development.
@@ -29,7 +29,7 @@ If you speak a language other than English that Destiny supports, a great way to
 
 ## Contributing
 
-See [CONTRIBUTING.md](https://github.com/LittleLightForDestiny/littlelight/blob/master/docs/CONTRIBUTING.md) for information on how to Contribute to the development of Little Light.
+See [CONTRIBUTING.md](docs/CONTRIBUTING.md) for information on how to Contribute to the development of Little Light.
 
 ## License
 Code released under the [MIT license](http://choosealicense.com/licenses/mit/).

android/app/build.gradle

@@ -1,3 +1,10 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "com.google.gms.google-services"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +13,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'
@@ -33,11 +35,6 @@ if (keyAvailable) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-apply plugin: 'com.google.firebase.crashlytics'
-apply plugin: 'com.google.gms.google-services'
 
 android {
     namespace "me.markezine.luzinha"
@@ -60,7 +57,7 @@ android {
     defaultConfig {
         applicationId "me.markezine.luzinha"
 
-        minSdkVersion 19
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -98,6 +95,3 @@ flutter {
     source '../..'
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}

android/build.gradle

@@ -1,19 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
-
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

android/settings.gradle

@@ -1,15 +1,27 @@
-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
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id("com.android.application") version "8.1.4" apply false
+    id("com.google.gms.google-services") version "4.4.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.7.10" apply false
+    id("com.google.firebase.crashlytics") version "3.0.1" apply false
 }
+
+include ":app"

ios/Flutter/AppFrameworkInfo.plist

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

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'