Skip to content

Commit 0084c3c

Browse files
tzutalintzutalin
committed
Update gradle version to 2.3
1 parent 90e2a8d commit 0084c3c

File tree

5 files changed

+43
-59
lines changed

5 files changed

+43
-59
lines changed

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -47,82 +46,65 @@
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5351
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5452
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5553
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5654
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5755
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6158
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6259
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6360
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6461
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6562
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7765
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7866
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7967
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8068
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8169
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8370
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8471
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8679
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.0.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.0.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.dexafree/materiallist/3.0.1/jars" />
9681
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
9982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
10684
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
10885
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
11086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
11287
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
11388
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
11489
</content>
11590
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
11691
<orderEntry type="sourceFolder" forTests="false" />
92+
<orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
11793
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
118-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
11994
<orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
120-
<orderEntry type="library" exported="" name="support-v13-23.0.0" level="project" />
121-
<orderEntry type="library" exported="" name="materiallist-3.0.1" level="project" />
12295
<orderEntry type="library" exported="" name="picasso-2.4.0" level="project" />
123-
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
124-
<orderEntry type="library" exported="" name="cardview-v7-23.0.0" level="project" />
125-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
96+
<orderEntry type="library" exported="" name="support-v4-25.0.0" level="project" />
97+
<orderEntry type="library" exported="" name="support-media-compat-25.0.0" level="project" />
98+
<orderEntry type="library" exported="" name="support-v13-25.0.0" level="project" />
99+
<orderEntry type="library" exported="" name="support-compat-25.0.0" level="project" />
100+
<orderEntry type="library" exported="" name="support-fragment-25.0.0" level="project" />
101+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.0.0" level="project" />
102+
<orderEntry type="library" exported="" name="support-core-ui-25.0.0" level="project" />
103+
<orderEntry type="library" exported="" name="cardview-v7-25.0.0" level="project" />
104+
<orderEntry type="library" exported="" name="materiallist-3.0.1" level="project" />
105+
<orderEntry type="library" exported="" name="appcompat-v7-25.0.0" level="project" />
106+
<orderEntry type="library" exported="" name="support-vector-drawable-25.0.0" level="project" />
107+
<orderEntry type="library" exported="" name="support-core-utils-25.0.0" level="project" />
126108
<orderEntry type="module" module-name="cnnlibs" exported="" />
127109
</component>
128110
</module>

‎build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0'
8+
classpath 'com.android.tools.build:gradle:2.3.0'
99
// NOTE: Do not place your application dependencies here; they belong
1010
// in the individual module build.gradle files
1111
}
@@ -25,6 +25,6 @@ ext {
2525
releaseVersionCode = 1
2626
releaseVersionName = '1.0.0'
2727

28-
androidBuildToolsVersion = '23.0.0'
29-
androidSupportSdkVersion = '23.0.0'
30-
}
28+
androidBuildToolsVersion = '25.0.0'
29+
androidSupportSdkVersion = '25.0.0'
30+
}

‎cnnlibs/cnnlibs.iml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -20,7 +19,7 @@
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2120
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2221
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23-
<option name="LIBRARY_PROJECT" value="true" />
22+
<option name="PROJECT_TYPE" value="1" />
2423
</configuration>
2524
</facet>
2625
</component>
@@ -33,68 +32,70 @@
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4243
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4849
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5354
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5455
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5556
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5757
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5859
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5960
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6061
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6162
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6263
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6566
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6667
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6768
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6869
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6970
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7171
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7273
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7374
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7475
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7576
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7677
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7980
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9294
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
9395
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9496
</content>
9597
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9698
<orderEntry type="sourceFolder" forTests="false" />
97-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
98-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-23" level="project" />
99+
<orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
99100
</component>
100101
</module>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Sep 26 16:12:40 CST 2016
1+
#Tue Mar 21 14:55:14 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)