Merge remote-tracking branch 'upstream/master'

This commit is contained in:
tzw
2025-01-28 17:08:04 +06:30
8 changed files with 20 additions and 17 deletions

28
.vscode/launch.json vendored
View File

@@ -5,10 +5,10 @@
"name": "Prod",
"request": "launch",
"type": "dart",
"program": "lib/main-prod.dart",
"program": "lib/main_prod.dart",
"args": [
"-t",
"lib/main-prod.dart",
"lib/main_prod.dart",
"--flavor",
"prod"
],
@@ -17,10 +17,10 @@
"name": "Local Dev",
"request": "launch",
"type": "dart",
"program": "lib/main-local.dart",
"program": "lib/main_local.dart",
"args": [
"-t",
"lib/main-local.dart",
"lib/main_local.dart",
"--flavor",
"dev"
],
@@ -29,10 +29,10 @@
"name": "Local Dev2",
"request": "launch",
"type": "dart",
"program": "lib/main-local.dart",
"program": "lib/main_local.dart",
"args": [
"-t",
"lib/main-local.dart",
"lib/main_local.dart",
"--flavor",
"dev"
],
@@ -41,10 +41,10 @@
"name": "Dev",
"request": "launch",
"type": "dart",
"program": "lib/main-dev.dart",
"program": "lib/main_dev.dart",
"args": [
"-t",
"lib/main-dev.dart",
"lib/main_dev.dart",
"--flavor",
"dev"
],
@@ -53,10 +53,10 @@
"name": "Dev2",
"request": "launch",
"type": "dart",
"program": "lib/main-dev.dart",
"program": "lib/main_dev.dart",
"args": [
"-t",
"lib/main-dev.dart",
"lib/main_dev.dart",
"--flavor",
"dev"
],
@@ -65,20 +65,20 @@
"name": "Dev iOS",
"request": "launch",
"type": "dart",
"program": "lib/main-dev.dart",
"program": "lib/main_dev.dart",
"args": [
"-t",
"lib/main-dev.dart",
"lib/main_dev.dart",
],
},
{
"name": "Prod iOS",
"request": "launch",
"type": "dart",
"program": "lib/main-prod.dart",
"program": "lib/main_prod.dart",
"args": [
"-t",
"lib/main-prod.dart",
"lib/main_prod.dart",
],
},
]

Binary file not shown.

View File

@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx2536M
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true

3
build_prod.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/bash
flutter clean
flutter build apk -t lib/main_prod.dart --flavor prod

View File

@@ -1,7 +1,7 @@
name: fcs
description: FCS Logistics
publish_to: 'none'
version: 1.1.0+12
version: 1.1.1+13
environment:
sdk: '>=3.0.6 <4.0.0'