Merge branch 'main' of https://github.com/vodemn/m3_lightmeter into feature/ML-62

This commit is contained in:
Vadim 2023-06-21 08:45:18 +02:00
commit 539e6f2a8f
4 changed files with 16 additions and 20 deletions

View file

@ -8,6 +8,9 @@ name: Build prod .aab & .apk
on: on:
workflow_dispatch: workflow_dispatch:
env:
BUILD_ARGS: --release --flavor prod --dart-define cameraPreviewAspectRatio=2/3 -t lib/main_prod.dart
jobs: jobs:
build: build:
runs-on: macos-11 runs-on: macos-11
@ -70,7 +73,7 @@ jobs:
flutter pub run intl_utils:generate flutter pub run intl_utils:generate
- name: Build apk - 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 - name: Upload apk to artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@ -79,23 +82,10 @@ jobs:
path: build/app/outputs/flutter-apk/app-prod-release.apk path: build/app/outputs/flutter-apk/app-prod-release.apk
- name: Build appbundle - 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 - name: Upload app bundle to artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: m3_lightmeter_bundle name: m3_lightmeter_bundle
path: build/app/outputs/bundle/prodRelease/app-prod-release.aab 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

View file

@ -57,7 +57,10 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 33 targetSdkVersion 33
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a' ndk {
debugSymbolLevel 'FULL'
abiFilters 'armeabi-v7a', 'arm64-v8a'
}
/// legacy material-lightmeter ap stopped updating after 60022 /// legacy material-lightmeter ap stopped updating after 60022
/// 7xxxx means that it is a new app /// 7xxxx means that it is a new app
versionCode 70000 + flutterVersionCode.toInteger() versionCode 70000 + flutterVersionCode.toInteger()
@ -95,7 +98,10 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
minifyEnabled true minifyEnabled true
shrinkResources true shrinkResources true
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a' ndk {
debugSymbolLevel 'FULL'
abiFilters 'armeabi-v7a', 'arm64-v8a'
}
} }
} }
} }

View file

@ -6,7 +6,7 @@ buildscript {
} }
dependencies { 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.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

View file

@ -1,7 +1,7 @@
name: lightmeter name: lightmeter
description: A new Flutter project. description: A new Flutter project.
publish_to: "none" publish_to: "none"
version: 0.11.4+27 version: 0.11.5+28
environment: environment:
sdk: ">=3.0.0 <4.0.0" sdk: ">=3.0.0 <4.0.0"