Skip to content

Commit 1511be9

Browse files
committed
Fix build issue
1 parent 75dde51 commit 1511be9

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

app/app.iml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,19 @@
137137
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
138138
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
139139
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
140-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
141-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
142140
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
143141
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
144142
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
145-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
146-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
147-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
148-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
149-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
150-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
151143
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
152144
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
153145
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
154-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
146+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
155147
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
156148
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
157-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
158149
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
159-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
150+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
160151
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
161152
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
162-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
163153
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
164154
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
165155
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
@@ -178,6 +168,7 @@
178168
<orderEntry type="library" name="firebase-iid-11.2.2" level="project" />
179169
<orderEntry type="library" name="transition-25.4.0" level="project" />
180170
<orderEntry type="library" name="jsoup-1.10.2" level="project" />
171+
<orderEntry type="library" name="kotlin-stdlib-jre7-1.1.3-2" level="project" />
181172
<orderEntry type="library" name="design-25.4.0" level="project" />
182173
<orderEntry type="library" name="support-core-ui-25.4.0" level="project" />
183174
<orderEntry type="library" name="leakcanary-analyzer-1.5.1" level="project" />
@@ -191,8 +182,6 @@
191182
<orderEntry type="library" name="support-fragment-25.4.0" level="project" />
192183
<orderEntry type="library" name="support-core-utils-25.4.0" level="project" />
193184
<orderEntry type="library" name="animated-progress-1.0" level="project" />
194-
<orderEntry type="library" name="kotlin-stdlib-1.1.3" level="project" />
195-
<orderEntry type="library" name="kotlin-stdlib-jre7-1.1.3" level="project" />
196185
<orderEntry type="library" name="firebase-jobdispatcher-0.7.0" level="project" />
197186
<orderEntry type="library" name="butterknife-annotations-8.8.0" level="project" />
198187
<orderEntry type="library" name="okio-1.13.0" level="project" />
@@ -208,6 +197,7 @@
208197
<orderEntry type="library" scope="TEST" name="hamcrest-core-1.3" level="project" />
209198
<orderEntry type="library" name="recyclerview-v7-25.4.0" level="project" />
210199
<orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
200+
<orderEntry type="library" name="kotlin-stdlib-1.1.3-2" level="project" />
211201
<orderEntry type="library" name="permissions-1.1.2" level="project" />
212202
<orderEntry type="library" name="support-annotations-25.4.0" level="project" />
213203
<orderEntry type="library" name="appcompat-v7-25.4.0" level="project" />

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.1.3'
2+
ext.kotlin_version = '1.1.3-2'
33
repositories {
44
jcenter()
55
}
@@ -23,7 +23,7 @@ allprojects {
2323
ext {
2424
minSdkVersion = 15
2525
targetSdkVersion = 26
26-
buildToolsVersion = '26.0.0'
26+
buildToolsVersion = '26.0.1'
2727

2828
versionNameDev = '4.4.0.2.3.5-dev'
2929
versionNameMain = '4.4.0.2.3.3-beta'

0 commit comments

Comments
 (0)