summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorAleksandr Granin <aleksandr@mullvad.net>2021-04-12 14:37:59 +0200
committerAleksandr Granin <aleksandr@mullvad.net>2021-04-12 14:37:59 +0200
commitbf0e2b748f2e85d37dcc1a4489cf2407974cec5d (patch)
treeefb30be3f2c4a5b268dfcecedb113fae847c486e /android
parent9c3e4a83b213fd065d1a5dd753d883f0b0f378ae (diff)
parent0b6a9816e4d93fecec9c65e7addc7b438c18848c (diff)
downloadmullvadvpn-bf0e2b748f2e85d37dcc1a4489cf2407974cec5d.tar.xz
mullvadvpn-bf0e2b748f2e85d37dcc1a4489cf2407974cec5d.zip
Merge branch 'add-ide-specific-files-to-gitignore'
Diffstat (limited to 'android')
-rw-r--r--android/.idea/.gitignore1
-rw-r--r--android/.idea/modules.xml8
-rw-r--r--android/.idea/modules/android.iml112
3 files changed, 1 insertions, 120 deletions
diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore
index 3847c4a643..15bf03b842 100644
--- a/android/.idea/.gitignore
+++ b/android/.idea/.gitignore
@@ -7,6 +7,7 @@ usage.statistics.xml
shelf
assetWizardSettings.xml
modules/android.iml
+modules.xml
# Gradle:
gradle.xml
diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml
deleted file mode 100644
index bf609e0009..0000000000
--- a/android/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
- </modules>
- </component>
-</project> \ No newline at end of file
diff --git a/android/.idea/modules/android.iml b/android/.idea/modules/android.iml
deleted file mode 100644
index 8914760316..0000000000
--- a/android/.idea/modules/android.iml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="android-gradle" name="Android-Gradle">
- <configuration>
- <option name="GRADLE_PROJECT_PATH" value=":" />
- <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.1.2" />
- <option name="LAST_KNOWN_AGP_VERSION" value="4.1.2" />
- </configuration>
- </facet>
- <facet type="android" name="Android">
- <configuration>
- <option name="SELECTED_BUILD_VARIANT" value="debug" />
- <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
- <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
- <afterSyncTasks>
- <task>generateDebugSources</task>
- </afterSyncTasks>
- <option name="ALLOW_USER_CONFIGURATION" value="false" />
- <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
- <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
- <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../src/main/res;file://$MODULE_DIR$/../../src/debug/res;file://$MODULE_DIR$/../../build/generated/res/rs/debug;file://$MODULE_DIR$/../../build/generated/res/resValues/debug" />
- <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../src/androidTest/res;file://$MODULE_DIR$/../../src/androidTestDebug/res;file://$MODULE_DIR$/../../build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../build/generated/res/resValues/androidTest/debug" />
- <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/build/extraAssets" />
- </configuration>
- </facet>
- <facet type="kotlin-language" name="Kotlin">
- <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
- <compilerSettings>
- <option name="additionalArguments" value="-Xallow-no-source-files -Werror -Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi,kotlinx.coroutines.ObsoleteCoroutinesApi" />
- </compilerSettings>
- <compilerArguments>
- <option name="destination" value="$MODULE_DIR$/../../build/tmp/kotlin-classes/debug" />
- <option name="classpath" value="$MODULE_DIR$/../../build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/d0a65dd5552a975e6239034b31349b7f/transformed/material-1.2.1-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/64c03afccf9019196068a1000c010482/transformed/appcompat-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/b98000071bc18bac801fb9d321621932/transformed/jetified-viewpager2-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/5329a5cd405ade02c50ec7033b50e50c/transformed/recyclerview-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/e04432edb1de11141009be4928f477ed/transformed/fragment-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ab0c07b4ce1a12e371e435156117761d/transformed/jetified-appcompat-resources-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/9137c020b47361a0afac6c07b31d0057/transformed/drawerlayout-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ffb867791d790325c47c560485ea8e8d/transformed/coordinatorlayout-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/52af50fae314f7bdc01a868039e263cd/transformed/viewpager-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/c8067b1c219d139714c353ddbe5492f5/transformed/customview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/d4583482cf0b3b26cba1c4437c15e092/transformed/transition-1.2.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/41f1afeed5b811945f2dc51c0860d632/transformed/vectordrawable-animated-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/0ce0b00fe93cf623edf5646e588e94ab/transformed/vectordrawable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/c75c6c73f16d777c26392338dfe57449/transformed/loader-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/645ffe1d911fa16caaf6428110496742/transformed/jetified-activity-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/477daa2da44e6acc83d1d91cb288e8a6/transformed/core-1.3.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/7acf0071f81c4d539febd943e21a1060/transformed/cursoradapter-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/fcf9451f0f905d9348f633e1ea0fe248/transformed/versionedparcelable-1.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/e38921028663005d568d63cc2db36b94/transformed/cardview-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/83c5dcb05c07136fdd0d06357b70082e/transformed/lifecycle-runtime-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/9c9552ea6970d86ca53749943ac68400/transformed/lifecycle-viewmodel-2.1.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/1c0ec23c27262d1594f0a69d27735e3c/transformed/jetified-savedstate-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/662ce10131f77f172cb0fe380185213a/transformed/lifecycle-livedata-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/d797bfaaed24da77ec42ea0b7fed5d97/transformed/lifecycle-livedata-core-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.1.0/c67e7807d9cd6c329b9d0218b2ec4e505dd340b7/lifecycle-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/4a2a9a1f28a7291ea7444c776a7f83d7/transformed/core-runtime-2.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/13f29bba78bf917647c0c408cdffbb5e/transformed/interpolator-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/404e3022a656b2ea4b411b602a8de396/transformed/jetified-annotation-experimental-1.0.0-api.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/6f39c3909a713b91f3ff47d9777e6e95/transformed/jetified-commons-validator-1.7.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/79f8a7e33fc0be48aa253f30c757433a/transformed/jetified-commons-beanutils-1.9.4.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/cbf4d94b5ed36b2dfa0698a364c92fb7/transformed/jetified-commons-logging-1.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ec4b6bd7e9bbfce6d6f2447d9d3441ae/transformed/jetified-commons-collections-3.2.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/ee84fa3f9259ff6bdb87f1d9870e80ff/transformed/jetified-commons-digester-2.1.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/dc0f1b855f1be392e97d0d418570091f/transformed/jetified-joda-time-2.10.2.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/0e8a2a42fe4c82aec6a1653c23b9d891/transformed/jetified-kotlinx-coroutines-android-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/7e2ee142673509ff0c25e15adf374106/transformed/jetified-kotlinx-coroutines-core-jvm-1.3.9.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/a08c72d33f09118b2ae811ee38fdc5b3/transformed/jetified-kotlin-stdlib-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/441993b51adbb0599cb5065c3d2399ff/transformed/jetified-kotlin-stdlib-common-1.4.10.jar:/Users/aleksandrgranin/.gradle/caches/transforms-3/45cbaac403abbc4ce2218947c4c1d10d/transformed/jetified-annotations-13.0.jar:/Users/aleksandrgranin/Library/Android/sdk/platforms/android-30/android.jar:/Users/aleksandrgranin/Library/Android/sdk/build-tools/30.0.3/core-lambda-stubs.jar" />
- <option name="noStdlib" value="true" />
- <option name="noReflect" value="true" />
- <option name="moduleName" value="android_debug" />
- <option name="languageVersion" value="1.4" />
- <option name="apiVersion" value="1.4" />
- <option name="pluginOptions">
- <array />
- </option>
- <option name="pluginClasspaths">
- <array />
- </option>
- <option name="errors">
- <ArgumentParseErrors />
- </option>
- </compilerArguments>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/../../build/intermediates/javac/debug/classes" />
- <output-test url="file://$MODULE_DIR$/../../build/intermediates/javac/debugUnitTest/classes" />
- <exclude-output />
- <content url="file://$MODULE_DIR$/../..">
- <sourceFolder url="file://$MODULE_DIR$/../../src/main/res" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/../../build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
- <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/../../build/extraAssets" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/../../build/generated/res/resValues/debug" type="java-resource" />
- <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
- <excludeFolder url="file://$MODULE_DIR$/../../build" />
- </content>
- <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
- <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
- <orderEntry type="library" name="Gradle: commons-validator:commons-validator:1.7" level="project" />
- <orderEntry type="library" name="Gradle: commons-beanutils:commons-beanutils:1.9.4" level="project" />
- <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
- <orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.2" level="project" />
- <orderEntry type="library" name="Gradle: commons-digester:commons-digester:2.1" level="project" />
- <orderEntry type="library" name="Gradle: joda-time:joda-time:2.10.2" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.10" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10" level="project" />
- <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
- <orderEntry type="library" name="Gradle: com.google.android.material:material:1.2.1@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.2.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.2.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.core:core:1.3.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
- <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
- </component>
-</module> \ No newline at end of file