diff --git a/.gitignore b/.gitignore
index 2f6afa6..d4670af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,24 @@
-# Maven build
-target/
-
 # Java class files
 *.class
 
-# generated files
+# Generated files
 bin/
 gen/
 out/
 obj/
-build/
 app/src/*/libs/
 app/src/*/obj/
 
+# Gradle files
+.gradle/
+build/
+# Ignore Gradle GUI config
+gradle-app.setting
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+# Cache of project
+.gradletasknamecache
+
 # Local configuration file (sdk path, etc)
 local.properties
 
@@ -26,21 +32,24 @@
 # Windows thumbnail db
 Thumbs.db
 
-# IDEA/Android Studio project files, because
-# the project can be imported from settings.gradle
-.idea
+# IntelliJ
 *.iml
-gradle-app.setting
-nb-configuration.xml
+.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
 
 # Old-style IDEA project files
 *.ipr
 *.iws
 
-# Gradle cache
-.gradle
-gradle.properties
-
 # Sandbox stuff
 _sandbox