feat: 支持google store制品打包

.gitlab-ci.yml

@@ -89,8 +89,12 @@ create-release:
       ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/StarLock-${StarLock_VERSION}-*"
     - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-xhj-release-${CI_COMMIT_TAG}.apk
       "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-xhj-release-${CI_COMMIT_TAG}.apk"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-xhj-release-${CI_COMMIT_TAG}.aab
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-xhj-release-${CI_COMMIT_TAG}.aab"'
     - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-sky-release-${CI_COMMIT_TAG}.apk
       "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.apk"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-sky-release-${CI_COMMIT_TAG}.aab
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.aab"'
     - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/starlock-xhj-release-${CI_COMMIT_TAG}.ipa
       "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-xhj-release-${CI_COMMIT_TAG}.ipa"'
     - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/starlock-sky-release-${CI_COMMIT_TAG}.ipa
@@ -102,15 +106,21 @@ create-release:
     ref: '$CI_COMMIT_TAG'
     assets:
       links:
-        - name: 'xhj binary package (Android)'
+        - name: 'xhj apk binary package'
           url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.apk'
           link_type: 'package'
-        - name: 'sky binary package (Android)'
+        - name: 'xhj bundle binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.aab'
+          link_type: 'package'
+        - name: 'sky apk binary package'
           url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.apk'
           link_type: 'package'
-        - name: 'xhj binary package (iOS)'
+        - name: 'sky bundle binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.aab'
+          link_type: 'package'
+        - name: 'xhj ipa binary package'
           url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.ipa'
           link_type: 'package'
-        - name: 'sky binary package (iOS)'
+        - name: 'sky ipa binary package'
           url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.ipa'
           link_type: 'package'

android/fastlane/Fastfile

@@ -24,6 +24,7 @@ $current_branch = ENV[$env_current_branch]
 $current_tag = ENV[$env_current_tag]
 
 $path_apk_output_dir = File.join($path_dir_build, 'build/app/outputs/flutter-apk')
+$path_bundle_output_dir = File.join($path_dir_build, 'build/app/outputs/bundle')
 
 
 def print_header header
@@ -67,7 +68,7 @@ platform :android do
     Dir.chdir "../.." do
        sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "#{flavor}_#{env}", "-t", "lib/main_#{flavor}_#{env}.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
     end
-    old_file_path = File.join($path_apk_output_dir, "app-#{flavor}-release.apk")
+    old_file_path = File.join($path_apk_output_dir, "app-#{flavor}_#{env}-release.apk")
     new_file_path = File.join($path_apk_output_dir, "starlock-#{flavor}-preview-#{build_version}.apk")
     File.rename(old_file_path, new_file_path)
     logs = changelog_from_git_commits(
@@ -93,9 +94,16 @@ platform :android do
     Dir.chdir "../.." do
         sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
     end
-    old_file_path = File.join($path_apk_output_dir, "app-#{flavor}-release.apk")
+    old_apk_file_path = File.join($path_apk_output_dir, "app-#{flavor}-release.apk")
-    new_file_path = File.join($path_apk_output_dir, "starlock-#{flavor}-release-"+$current_tag+".apk")
+    new_apk_file_path = File.join($path_apk_output_dir, "starlock-#{flavor}-release-"+$current_tag+".apk")
-    File.rename(old_file_path, new_file_path)
+    File.rename(old_apk_file_path, new_apk_file_path)
+    Dir.chdir "../.." do
+        sh("flutter", "build", "appbundle", "--no-tree-shake-icons", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
+    end
+    old_bundle_file_path = File.join($path_bundle_output_dir , "/#{flavor}Release/app-#{flavor}-release.aab")
+    new_bundle_file_path = File.join($path_bundle_output_dir , "/#{flavor}Release/starlock-#{flavor}-release-"+$current_tag+".aab")
+    File.rename(old_bundle_file_path, new_bundle_file_path)
+    sh('cp',new_bundle_file_path,$path_apk_output_dir)
   end
 
   lane :upload_file_to_pgy do |options|