summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2021-07-06 11:32:24 +0100
committerEmīls Piņķis <emils@mullvad.net>2021-07-06 11:32:24 +0100
commit6eb930130001a21ac63142ee52afa3f6b215f688 (patch)
treea282c2a9102e9aaa6cd8b5ac93a20b38836e6693
parentf03255e144ece66003850f70cb9df91ecc127814 (diff)
parent6304d2b84ec538791f94b84a6a13aaeda13f6967 (diff)
downloadmullvadvpn-6eb930130001a21ac63142ee52afa3f6b215f688.tar.xz
mullvadvpn-6eb930130001a21ac63142ee52afa3f6b215f688.zip
Merge branch 'remove-android-studio-files'
-rw-r--r--.gitignore1
-rw-r--r--android/.idea/.gitignore18
-rw-r--r--android/.idea/codeStyles/Project.xml117
-rw-r--r--android/.idea/codeStyles/codeStyleConfig.xml5
-rw-r--r--android/.idea/compiler.xml6
-rw-r--r--android/.idea/jarRepositories.xml25
-rw-r--r--android/.idea/misc.xml9
7 files changed, 1 insertions, 180 deletions
diff --git a/.gitignore b/.gitignore
index 21f8064886..e41edf6b7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
/wireguard/libwg/exports.def
**/.vs/
*.bak
+android/.idea
diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
deleted file mode 100644
index 286031edc8..0000000000
--- a/android/.idea/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# User-specific stuff:
-workspace.xml
-tasks.xml
-dictionaries
-vcs.xml
-usage.statistics.xml
-shelf
-assetWizardSettings.xml
-modules/android.iml
-modules.xml
-kotlinc.xml
-
-# Gradle:
-gradle.xml
-libraries
-
-# Android studio 3.1+ serialized cache file
-caches/build_file_checksums.ser
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
deleted file mode 100644
index 4bec4ea8ae..0000000000
--- a/android/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <code_scheme name="Project" version="173">
- <codeStyleSettings language="XML">
- <option name="FORCE_REARRANGE_MODE" value="1" />
- <indentOptions>
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- </indentOptions>
- <arrangement>
- <rules>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>xmlns:android</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>^$</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>xmlns:.*</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>^$</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:id</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:name</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>name</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>^$</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>style</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>^$</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>^$</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>ANDROID_ATTRIBUTE_ORDER</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*</NAME>
- <XML_ATTRIBUTE />
- <XML_NAMESPACE>.*</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- </rules>
- </arrangement>
- </codeStyleSettings>
- </code_scheme>
-</component> \ No newline at end of file
diff --git a/android/.idea/codeStyles/codeStyleConfig.xml b/android/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a179b..0000000000
--- a/android/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <state>
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
- </state>
-</component> \ No newline at end of file
diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
deleted file mode 100644
index 61a9130cd9..0000000000
--- a/android/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <bytecodeTargetLevel target="1.8" />
- </component>
-</project> \ No newline at end of file
diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml
deleted file mode 100644
index a5f05cd8c8..0000000000
--- a/android/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RemoteRepositoriesConfiguration">
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Maven Central repository" />
- <option name="url" value="https://repo1.maven.org/maven2" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="jboss.community" />
- <option name="name" value="JBoss Community repository" />
- <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="BintrayJCenter" />
- <option name="name" value="BintrayJCenter" />
- <option name="url" value="https://jcenter.bintray.com/" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="Google" />
- <option name="name" value="Google" />
- <option name="url" value="https://dl.google.com/dl/android/maven2/" />
- </remote-repository>
- </component>
-</project> \ No newline at end of file
diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml
deleted file mode 100644
index d5d35ec44f..0000000000
--- a/android/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/build/classes" />
- </component>
- <component name="ProjectType">
- <option name="id" value="Android" />
- </component>
-</project> \ No newline at end of file