revert changes

.circleci/config.yml

@@ -66,9 +66,9 @@ commands:
   gradle-dependencies:
     description: "Get Gradle dependencies"
     steps:
-#      - restore_cache:
-#          name: Restore Gradle cache
-#          key: v1-gradle-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
+      - restore_cache:
+          name: Restore Gradle cache
+          key: v1-gradle-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
       - run:
           working_directory: android
           name: Download Gradle dependencies
@@ -562,9 +562,7 @@ workflows:
                 - /^build-ios-beta-\d+$/
 
       - build-android-pr:
-          context:
-            - mattermost-mobile-android-pr
-            - mattermost-mobile-sentry
+          context: mattermost-mobile-android-pr
           requires:
             - test
           filters:
@@ -607,7 +605,7 @@ workflows:
           #       - /^build-ios-\d+$/
           #       - /^build-ios-beta-\d+$/
           #       - /^build-ios-sim-\d+$/
-
+                
       # - github-release:
       #     context: mattermost-mobile-unsigned
       #     requires:

fastlane/Fastfile

@@ -177,7 +177,7 @@ lane :upload_file_to_s3 do |options|
   extension = os_type == "android" ? "*.apk" : "*.ipa"
   build_folder_path = Dir[File.expand_path('..')].first
   files = []
-
+  
   unless options[:file].nil? || options[:file].empty?
     files.push("#{build_folder_path}/#{options[:file]}")
   else
@@ -194,7 +194,7 @@ lane :upload_file_to_s3 do |options|
       pr_file = File.basename(files.first)
       plist_file = "#{File.basename(files.first, '.*')}.plist"
     else
-      version_number = os_type == "android" ?
+      version_number = os_type == "android" ? 
         android_get_version_name(gradle_file: './android/app/build.gradle') :
         get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost')
       build_number = os_type == "android" ?
@@ -207,7 +207,7 @@ lane :upload_file_to_s3 do |options|
     s3_folder = is_build_pr ?
       "#{ENV['AWS_FOLDER_NAME']}/#{ENV['BRANCH_TO_BUILD']}" :
       "#{ENV['AWS_FOLDER_NAME']}/#{version_number}/#{build_number}"
-
+    
     s3 = Aws::S3::Resource.new(region: s3_region)
     s3_bucket = s3.bucket(s3_bucket_name)
     mutex = Mutex.new
@@ -254,7 +254,7 @@ lane :upload_file_to_s3 do |options|
                             :install_url => install_url
                         })
     end
-
+  
     if options[:file] == 'Mattermost-simulator-x86_64.app.zip'
       pretext = '#### New iOS build for VM/Simulator'
       msg = "Download link: #{links.first}"
@@ -741,8 +741,7 @@ platform :android do
         properties: {
           'separateApk' => ENV["SEPARATE_APKS"] || false,
           'universalApk' => ENV["SEPARATE_APKS"] || false,
-        },
-        flags: "-Dorg.gradle.daemon=false -Dorg.gradle.caching=false -Dorg.gradle.jvmargs=\"-Xmx2g -XX:+HeapDumpOnOutOfMemoryError\""
+        }
     )
   end
 
@@ -851,14 +850,14 @@ def get_apple_api_key
           f.write("\n") unless index == p8_array.length - 1
         end
       end
-
+    
       api_key = app_store_connect_api_key(
         key_id: ENV['IOS_API_KEY_ID'],
         issuer_id: ENV['IOS_API_ISSUER_ID'],
         key_filepath: "./#{api_key_path}",
         in_house: ENV['IOS_IN_HOUSE'] == 'true', # optional but may be required if using match/sigh
       )
-
+    
       File.delete("../#{api_key_path}")
     end