Merge branch 'release_sky' into 'master_sky'
Release sky See merge request StarlockTeam/app-starlock!252
This commit is contained in:
commit
bb8e2fe506
@ -73,6 +73,7 @@ variables:
|
||||
- gem env
|
||||
- bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/
|
||||
- bundle install --gemfile android/Gemfile --path vendor/bundle_android --quiet
|
||||
- flutter clean
|
||||
cache:
|
||||
paths:
|
||||
- app_new.version
|
||||
@ -92,6 +93,7 @@ variables:
|
||||
- gem env
|
||||
- bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/
|
||||
- bundle install --gemfile ios/Gemfile --path vendor/bundle_ios --quiet
|
||||
- flutter clean
|
||||
cache:
|
||||
paths:
|
||||
- app_new.version
|
||||
|
||||
@ -226,7 +226,7 @@ android {
|
||||
// You can update the following values to match your application needs.
|
||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
|
||||
minSdkVersion 25
|
||||
targetSdkVersion 34
|
||||
targetSdkVersion 35
|
||||
versionCode flutterVersionCode.toInteger()
|
||||
versionName flutterVersionName
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
|
||||
@ -63,6 +63,7 @@ platform :android do
|
||||
print_log "last_git_commit_short_hash #{short_hash}"
|
||||
remove_zone_pre_build(zone:"com")
|
||||
Dir.chdir "../.." do
|
||||
sh("flutter","clean")
|
||||
sh("flutter","pub","get")
|
||||
sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "sky_#{env}", "-t", "lib/main_sky_#{env}.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
|
||||
end
|
||||
|
||||
@ -75,6 +75,7 @@ platform :ios do
|
||||
print_log "last_git_commit_short_hash #{short_hash}"
|
||||
remove_zone_pre_build(zone:"com")
|
||||
Dir.chdir "../.." do
|
||||
sh("flutter","clean")
|
||||
sh("flutter","pub","get")
|
||||
end
|
||||
Dir.chdir ".." do
|
||||
|
||||
1775
pubspec.lock
1775
pubspec.lock
File diff suppressed because it is too large
Load Diff
@ -180,7 +180,8 @@ dependencies:
|
||||
#
|
||||
event_bus: ^2.0.0
|
||||
#菊花
|
||||
flutter_easyloading: ^3.0.5
|
||||
flutter_easyloading: 3.0.5
|
||||
flutter_spinkit: 5.2.1
|
||||
#图形验证码
|
||||
# aj_captcha_flutter: ^0.0.1
|
||||
asn1lib: ^1.6.5
|
||||
@ -217,7 +218,7 @@ dependencies:
|
||||
|
||||
jpush_flutter:
|
||||
git:
|
||||
url: git@code-internal.star-lock.cn:StarlockTeam/jpush_flutter.git
|
||||
url: git@code.star-lock.cn:StarlockTeam/jpush_flutter.git
|
||||
ref: 656df9ee91b1ec8b96aa1208a6b0df27a4516067
|
||||
|
||||
#视频播放器
|
||||
@ -322,6 +323,7 @@ flutter:
|
||||
- images/tabbar/
|
||||
- images/guide/
|
||||
- images/main/
|
||||
- images/main/addFingerprint/
|
||||
- images/mine/
|
||||
- images/lockType/
|
||||
- assets/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user