Skip to content

Commit abea0cf

Browse files
hallahanhallahan
committed
Version 1.2
1 parent 954fddc commit abea0cf

File tree

2 files changed

+25
-12
lines changed

2 files changed

+25
-12
lines changed

‎app/app.iml‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7567
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,9 +72,20 @@
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.5/jars" />
8790
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.5/jars" />
8891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
@@ -92,19 +95,29 @@
9295
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
9396
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.journeyapps/zxing-android-embedded/3.2.0/jars" />
9497
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
95104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
96106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
97108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
98109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
99110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
100112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
101114
</content>
102115
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
103116
<orderEntry type="sourceFolder" forTests="false" />
104117
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
105-
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
106-
<orderEntry type="library" exported="" name="okhttp-urlconnection-2.4.0" level="project" />
107118
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
119+
<orderEntry type="library" exported="" name="okhttp-urlconnection-2.4.0" level="project" />
120+
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
108121
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
109122
<orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
110123
<orderEntry type="library" exported="" name="zxing-android-embedded-3.2.0" level="project" />

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId "org.redcross.openmapkit"
1313
minSdkVersion 16
1414
targetSdkVersion 21
15-
versionCode 22
16-
versionName "1.1"
15+
versionCode 23
16+
versionName "1.2"
1717
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1818
}
1919
buildTypes {

0 commit comments

Comments
 (0)