diff --git a/.github/workflows/cd_prod.yml b/.github/workflows/cd_prod.yml index 67ff83f..f8f0274 100644 --- a/.github/workflows/cd_prod.yml +++ b/.github/workflows/cd_prod.yml @@ -8,6 +8,9 @@ name: Build prod .aab & .apk on: workflow_dispatch: +env: + BUILD_ARGS: --release --flavor prod --dart-define cameraPreviewAspectRatio=2/3 -t lib/main_prod.dart + jobs: build: runs-on: macos-11 @@ -70,7 +73,7 @@ jobs: flutter pub run intl_utils:generate - name: Build apk - run: flutter build apk --release --flavor prod --dart-define cameraPreviewAspectRatio=2/3 -t lib/main_prod.dart + run: flutter build apk $BUILD_ARGS - name: Upload apk to artifacts uses: actions/upload-artifact@v3 @@ -79,23 +82,10 @@ jobs: path: build/app/outputs/flutter-apk/app-prod-release.apk - name: Build appbundle - run: flutter build appbundle --release --flavor prod --dart-define cameraPreviewAspectRatio=2/3 -t lib/main_prod.dart + run: flutter build appbundle $BUILD_ARGS - name: Upload app bundle to artifacts uses: actions/upload-artifact@v3 with: name: m3_lightmeter_bundle path: build/app/outputs/bundle/prodRelease/app-prod-release.aab - - - name: Zip merged_native_libs folder - uses: thedoctor0/zip-release@0.7.1 - with: - type: 'zip' - path: 'build/app/intermediates/merged_native_libs/prodRelease/out/lib/' - filename: 'merged_native_libs.zip' - - - name: Upload merged_native_libs to artifacts - uses: actions/upload-artifact@v3 - with: - name: merged_native_libs - path: merged_native_libs.zip \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 08105f1..4bc9578 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -56,8 +56,11 @@ android { defaultConfig { minSdkVersion 21 - targetSdkVersion 33 - ndk.abiFilters 'armeabi-v7a', 'arm64-v8a' + targetSdkVersion 33 + ndk { + debugSymbolLevel 'FULL' + abiFilters 'armeabi-v7a', 'arm64-v8a' + } /// legacy material-lightmeter ap stopped updating after 60022 /// 7xxxx means that it is a new app versionCode 70000 + flutterVersionCode.toInteger() @@ -95,7 +98,10 @@ android { signingConfig signingConfigs.release minifyEnabled true shrinkResources true - ndk.abiFilters 'armeabi-v7a', 'arm64-v8a' + ndk { + debugSymbolLevel 'FULL' + abiFilters 'armeabi-v7a', 'arm64-v8a' + } } } } diff --git a/android/build.gradle b/android/build.gradle index 78e3d31..346e639 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.google.gms:google-services:4.3.10' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/pubspec.yaml b/pubspec.yaml index 3c2451d..8c35dd6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: lightmeter description: A new Flutter project. publish_to: "none" -version: 0.11.4+27 +version: 0.11.5+28 environment: sdk: ">=3.0.0 <4.0.0"