diff --git a/.gitignore b/.gitignore
index 08ccbb5793..35a830ed7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,8 @@
 /android/**/captures
 /android/**/.externalNativeBuild
 /android/**/.vagrant
+/android/**/.settings/
+/android/**/.classpath
 /stage
 /android/BOINC/app/src/main/assets/arm*
 /android/BOINC/app/src/main/assets/mips*
diff --git a/android/BOINC/.idea/codeStyles/Project.xml b/android/BOINC/.idea/codeStyles/Project.xml
index 3f3670f712..8e47a575a9 100644
--- a/android/BOINC/.idea/codeStyles/Project.xml
+++ b/android/BOINC/.idea/codeStyles/Project.xml
@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
     <XML>
       <option name="XML_TEXT_WRAP" value="0" />
     </XML>
@@ -142,5 +145,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/android/BOINC/.idea/misc.xml b/android/BOINC/.idea/misc.xml
index d5fa0fba83..3ca5f7a86b 100644
--- a/android/BOINC/.idea/misc.xml
+++ b/android/BOINC/.idea/misc.xml
@@ -45,5 +45,5 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/android/BOINC/.project b/android/BOINC/.project
index bbefd114d4..a1ef9d8d27 100644
--- a/android/BOINC/.project
+++ b/android/BOINC/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
@@ -29,5 +34,6 @@
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>