Fixed merge conflict

2026-10-16 07:49:44 +08:00 · 2022-10-24 17:18:40 +05:30
parent 9ec401c4b3
commit 176ef2a868
2 changed files with 107 additions and 26 deletions
@@ -1,32 +1,29 @@
 # Build Actions
-Gradle Build Actions.
+
+The IDE provides access to various tasks which you can execute to build your project.
+Below is the list of tasks that are accessible from the IDE with their brief description
+and the actual Gradle tasks that the IDE executes.

 ## Build Tasks
+
+Tasks to build your project.
+
 To set `gradle options`, go to `Preferences > Build & Run > Additional Gradle commands`.
-### Build
-Runs `./gradlew build [options..]`<br/>
-The `build` task is to designate assembling all outputs and running all checks.
-### assembleDebug
-To initiate a debug build, invoke the `assembleDebug` task:<br/>
-Runs `./gradlew assembleDebug [options..]`
-### assembleRelease
-To initiate a release build, invoke the `assembleRelease` task:<br/>
-Runs `./gradlew assembleRelease [options..]`
-### Create AAB
-Runs `./gradlew bundle [options..]`<br/>
-Generates an app bundle (.aab file).
-### Clean
-Runs `./gradlew clean [options..]`<br/>
-You can delete the contents of the build directory using the `clean` task.
-### Clean & Build
-Runs `./gradlew clean build [options..]`<br/>
-At first runs `clean` task then `build` task.
+
+| Task             | Description                                                                                                        |
+| ---------------- | ------------------------------------------------------------------------------------------------------------------ |
+| Build            | Runs `./gradlew build [options..]` The `build` task is to designate assembling all outputs and running all checks. |
+| Assemble Debug   | To initiate a debug build, invoke the `assembleDebug` task. Runs `./gradlew assembleDebug [options..]`             |
+| Assemble Release | To initiate a release build, invoke the `assembleRelease` task. Runs `./gradlew assembleRelease [options..]`       |
+| Create AAB       | Runs `./gradlew bundle [options..]`, Generates an app bundle (.aab file).                                          |
+| Clean            | Runs `./gradlew clean [options..]`. You can delete the contents of the build directory using the `clean` task.     |
+| Clean & Build    | Runs `./gradlew clean build [options..]`. At first runs `clean` task then `build` task.                            |

 ## Lint Tasks
 The lint tool checks for structural code problems that could affect the quality and performance of your Android application.
-### Lint
-Runs Lint for all build variants. [`./gradlew lint`]
-### lintRelease
-Runs Lint for release variant. [`./gradlew lintRelease`]
-### lintDebug
-Runs Lint for debug variant. [`./gradlew lintDebug`]
+
+| Task           | Description                                              |
+| -------------- | -------------------------------------------------------- |
+| `Lint`         | Runs Lint for all build variants. [`./gradlew lint`]     |
+| `Lint release` | Runs Lint for release variant. [`./gradlew lintRelease`] |
+| `Lint Debug`   | Runs Lint for debug variant. [`./gradlew lintDebug`]     |
@@ -1 +1,85 @@
-/build
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+/bin/
+/gen/
+/out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/