Skip to content

Commit f83d07d

Browse files
committed
Version 5.6.1 released.
1 parent dce3010 commit f83d07d

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

app/app.iml

Lines changed: 11 additions & 8 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,6 +72,14 @@
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" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -108,6 +108,9 @@
108108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
109109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
110110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
111114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
112115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
113116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
minSdkVersion 15
1111
multiDexEnabled true
1212
targetSdkVersion 23
13-
versionCode 22
14-
versionName '5.0.1'
13+
versionCode 24
14+
versionName '5.6.1'
1515
// To disable this functionality (and gain the true advantage and space savings of this Support Library)
1616
// http://android-developers.blogspot.sg/2016/02/android-support-library-232.html
1717
// vectorDrawables.useSupportLibrary = true

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<application
1414
android:name=".application.CarbonForumApplication"
15+
android:hardwareAccelerated="true"
1516
android:allowBackup="true"
1617
android:fullBackupContent="@xml/mybackupscheme"
1718
android:fullBackupOnly="true"

0 commit comments

Comments
 (0)