Update gradle files and others

.github/workflows/on-release.yml

@@ -81,8 +81,8 @@ jobs:
 
  - name: Build app bundle
  run: |
- flutter build appbundle --obfuscate --split-debug-info=./build-debug-file --flavor free
- flutter build appbundle --obfuscate --split-debug-info=./build-debug-file --flavor pro
+ submodules/flutter/bin/flutter build appbundle --obfuscate --split-debug-info=./build-debug-file --flavor free
+ submodules/flutter/bin/flutter build appbundle --obfuscate --split-debug-info=./build-debug-file --flavor pro
 
  - name: Publish on Google Play Free
  uses: r0adkll/upload-google-play@v1

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,10 +22,6 @@ 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 34
 
@@ -99,18 +96,19 @@ flutter {
 }
 
 dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
  testImplementation 'junit:junit:4.13.2'
  androidTestImplementation 'androidx.test:runner:1.5.2'
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
 
+ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, x86_64: 4]
+
 // F-droid requires variant.versionCode * 1000 + baseAbiVersionCode
 // instead of the flutter default: baseAbiVersionCode * 1000 + variant.versionCode
 // read more at: https://github.com/emavgl/oinkoin/issues/120
 android.applicationVariants.all { variant ->
  variant.outputs.each { output ->
- def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+ def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter("ABI"))
  if (baseAbiVersionCode != null) {
  output.versionCodeOverride = variant.versionCode * 1000 + baseAbiVersionCode
  }

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
- ext.kotlin_version = '1.9.20'
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.1.3'
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
 allprojects {
  repositories {
  google()

android/settings.gradle

@@ -1,15 +1,25 @@
-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 "7.2.1" apply false
+ id "org.jetbrains.kotlin.android" version "1.9.24" apply false
 }
+
+include ":app"

ios/Flutter/flutter_export_environment.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=C:\development\oinkoin\submodules\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\development\oinkoin"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "FLUTTER_BUILD_NAME=1.0.62"
+export "FLUTTER_BUILD_NUMBER=6055"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=true"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.dart_tool/package_config.json"

macos/Flutter/ephemeral/Flutter-Generated.xcconfig

@@ -1,10 +1,10 @@
 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/home/emavgl/Programs/flutter
-FLUTTER_APPLICATION_PATH=/home/emavgl/Projects/piggybank-flutter
+FLUTTER_ROOT=C:\development\oinkoin\submodules\flutter
+FLUTTER_APPLICATION_PATH=C:\development\oinkoin
 COCOAPODS_PARALLEL_CODE_SIGN=true
 FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=1.0.34
-FLUTTER_BUILD_NUMBER=6030
+FLUTTER_BUILD_NAME=1.0.62
+FLUTTER_BUILD_NUMBER=6055
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false

macos/Flutter/ephemeral/flutter_export_environment.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/home/emavgl/Programs/flutter"
-export "FLUTTER_APPLICATION_PATH=/home/emavgl/Projects/piggybank-flutter"
+export "FLUTTER_ROOT=C:\development\oinkoin\submodules\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\development\oinkoin"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=1.0.34"
-export "FLUTTER_BUILD_NUMBER=6030"
+export "FLUTTER_BUILD_NAME=1.0.62"
+export "FLUTTER_BUILD_NUMBER=6055"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"

pubspec.lock

@@ -85,18 +85,18 @@ packages:
  dependency: "direct dev"
  description:
  name: build_runner
- sha256: "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa"
+ sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
  url: "https://pub.dev"
  source: hosted
- version: "2.4.10"
+ version: "2.4.11"
  build_runner_core:
  dependency: transitive
  description:
  name: build_runner_core
- sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
+ sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
  url: "https://pub.dev"
  source: hosted
- version: "7.3.0"
+ version: "7.3.1"
  built_collection:
  dependency: transitive
  description:
@@ -649,10 +649,10 @@ packages:
  dependency: transitive
  description:
  name: path_provider_android
- sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+ sha256: bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a
  url: "https://pub.dev"
  source: hosted
- version: "2.2.5"
+ version: "2.2.6"
  path_provider_foundation:
  dependency: transitive
  description:
@@ -689,10 +689,10 @@ packages:
  dependency: transitive
  description:
  name: platform
- sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+ sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
  url: "https://pub.dev"
  source: hosted
- version: "3.1.4"
+ version: "3.1.5"
  plugin_platform_interface:
  dependency: transitive
  description:
@@ -1030,10 +1030,10 @@ packages:
  dependency: "direct main"
  description:
  name: url_launcher
- sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+ sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
  url: "https://pub.dev"
  source: hosted
- version: "6.2.6"
+ version: "6.3.0"
  url_launcher_android:
  dependency: transitive
  description:
@@ -1171,5 +1171,5 @@ packages:
  source: hosted
  version: "3.1.2"
 sdks:
- dart: ">=3.4.0 <=3.4.1"
+ dart: ">=3.4.0 <=3.22.1"
  flutter: ">=3.22.0"

pubspec.yaml

@@ -14,7 +14,7 @@ description: The expenses under your control.
 version: 1.0.62+6055
 
 environment:
- sdk: '>=2.17.0 <=3.4.1'
+ sdk: '>=2.17.0 <=3.22.1'
 
 dependencies:
  flutter: