Skip to content
This repository was archived by the owner on Nov 2, 2022. It is now read-only.

Commit d3a5ad4

Browse files
author
Serghei Ceacal
committed
Revert changes in app.iml
1 parent b63ff32 commit d3a5ad4

3 files changed

Lines changed: 46 additions & 40 deletions

File tree

‎app/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
/app.iml

‎app/app.iml‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="pushjet-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -22,11 +22,12 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
2626
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2727
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
@@ -43,30 +44,35 @@
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
4850
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
4951
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5052
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5153
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5457
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5558
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5659
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5760
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
6165
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
6266
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
6367
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6671
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6772
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6873
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6974
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7076
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7177
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7278
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -117,41 +123,40 @@
117123
</content>
118124
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
119125
<orderEntry type="sourceFolder" forTests="false" />
120-
<orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable:24.0.0-alpha2@aar" level="project" />
121-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:24.0.0-alpha2@jar" level="project" />
122-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-basement:8.4.0@aar" level="project" />
123-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-cast:8.4.0@aar" level="project" />
124-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-measurement:8.4.0@aar" level="project" />
125-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-wallet:8.4.0@aar" level="project" />
126-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-appindexing:8.4.0@aar" level="project" />
127-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-fitness:8.4.0@aar" level="project" />
128-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-appinvite:8.4.0@aar" level="project" />
129-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-plus:8.4.0@aar" level="project" />
130-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-appstate:8.4.0@aar" level="project" />
131-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable:24.0.0-alpha2@aar" level="project" />
132-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-vision:8.4.0@aar" level="project" />
133-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-gcm:8.4.0@aar" level="project" />
134-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-panorama:8.4.0@aar" level="project" />
135-
<orderEntry type="library" exported="" name="Gradle: com.android.support:mediarouter-v7:23.0.0@aar" level="project" />
136-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-maps:8.4.0@aar" level="project" />
137-
<orderEntry type="library" exported="" name="Gradle: com.journeyapps:zxing-android-embedded:2.3.0@aar" level="project" />
138-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-games:8.4.0@aar" level="project" />
139-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-identity:8.4.0@aar" level="project" />
140-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-wearable:8.4.0@aar" level="project" />
141-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services:8.4.0@aar" level="project" />
142-
<orderEntry type="library" exported="" name="Gradle: com.android.support:appcompat-v7:24.0.0-alpha2@aar" level="project" />
143-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-location:8.4.0@aar" level="project" />
144-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-nearby:8.4.0@aar" level="project" />
145-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-auth:8.4.0@aar" level="project" />
146-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-analytics:8.4.0@aar" level="project" />
147-
<orderEntry type="library" exported="" name="Gradle: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0@jar" level="project" />
148-
<orderEntry type="library" exported="" name="Gradle: com.google.zxing:core:2.2@jar" level="project" />
149-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-ads:8.4.0@aar" level="project" />
150-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-drive:8.4.0@aar" level="project" />
151-
<orderEntry type="library" exported="" name="Gradle: com.android.support:support-v4:24.0.0-alpha2@aar" level="project" />
152-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-base:8.4.0@aar" level="project" />
153-
<orderEntry type="library" exported="" name="Gradle: com.google.android.gms:play-services-safetynet:8.4.0@aar" level="project" />
154-
<orderEntry type="library" exported="" name="Gradle: com.journeyapps:zxing-android-integration:2.3.0@aar" level="project" />
155-
<orderEntry type="library" exported="" name="Gradle: org.apache.http.legacy-android-23" level="project" />
126+
<orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
127+
<orderEntry type="library" exported="" name="zxing-android-integration-2.3.0" level="project" />
128+
<orderEntry type="library" exported="" name="play-services-identity-8.4.0" level="project" />
129+
<orderEntry type="library" exported="" name="play-services-vision-8.4.0" level="project" />
130+
<orderEntry type="library" exported="" name="play-services-auth-8.4.0" level="project" />
131+
<orderEntry type="library" exported="" name="play-services-wearable-8.4.0" level="project" />
132+
<orderEntry type="library" exported="" name="play-services-location-8.4.0" level="project" />
133+
<orderEntry type="library" exported="" name="zxing-android-embedded-2.3.0" level="project" />
134+
<orderEntry type="library" exported="" name="play-services-appindexing-8.4.0" level="project" />
135+
<orderEntry type="library" exported="" name="play-services-nearby-8.4.0" level="project" />
136+
<orderEntry type="library" exported="" name="play-services-8.4.0" level="project" />
137+
<orderEntry type="library" exported="" name="play-services-drive-8.4.0" level="project" />
138+
<orderEntry type="library" exported="" name="play-services-safetynet-8.4.0" level="project" />
139+
<orderEntry type="library" exported="" name="appcompat-v7-24.0.0-alpha2" level="project" />
140+
<orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
141+
<orderEntry type="library" exported="" name="support-v4-24.0.0-alpha2" level="project" />
142+
<orderEntry type="library" exported="" name="play-services-maps-8.4.0" level="project" />
143+
<orderEntry type="library" exported="" name="play-services-appinvite-8.4.0" level="project" />
144+
<orderEntry type="library" exported="" name="play-services-ads-8.4.0" level="project" />
145+
<orderEntry type="library" exported="" name="core-2.2" level="project" />
146+
<orderEntry type="library" exported="" name="play-services-fitness-8.4.0" level="project" />
147+
<orderEntry type="library" exported="" name="play-services-games-8.4.0" level="project" />
148+
<orderEntry type="library" exported="" name="mediarouter-v7-23.0.0" level="project" />
149+
<orderEntry type="library" exported="" name="play-services-wallet-8.4.0" level="project" />
150+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.0.0-alpha2" level="project" />
151+
<orderEntry type="library" exported="" name="play-services-appstate-8.4.0" level="project" />
152+
<orderEntry type="library" exported="" name="play-services-gcm-8.4.0" level="project" />
153+
<orderEntry type="library" exported="" name="play-services-panorama-8.4.0" level="project" />
154+
<orderEntry type="library" exported="" name="support-vector-drawable-24.0.0-alpha2" level="project" />
155+
<orderEntry type="library" exported="" name="play-services-plus-8.4.0" level="project" />
156+
<orderEntry type="library" exported="" name="support-annotations-24.0.0-alpha2" level="project" />
157+
<orderEntry type="library" exported="" name="play-services-analytics-8.4.0" level="project" />
158+
<orderEntry type="library" exported="" name="play-services-measurement-8.4.0" level="project" />
159+
<orderEntry type="library" exported="" name="play-services-cast-8.4.0" level="project" />
160+
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
156161
</component>
157162
</module>

‎pushjet-android.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="pushjet-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">
2+
<module external.linked.project.id="Pushjet-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">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

0 commit comments

Comments
 (0)