Skip to content

Commit 9169768

Browse files
jparreirajparreira
committed
Bump Gradle
1 parent d1abc9d commit 9169768

File tree

9 files changed

+722
-383
lines changed

9 files changed

+722
-383
lines changed

‎.idea/encodings.xml

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

‎.idea/gradle.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/hamcrest_core_1_3.xml

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

‎.idea/libraries/junit_4_12.xml

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

‎.idea/libraries/support_v4_23_0_1.xml

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

‎.idea/workspace.xml

Lines changed: 647 additions & 366 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,50 +47,76 @@
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5359
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5460
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5561
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5662
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5763
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5864
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5965
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6067
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6168
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6269
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6370
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6471
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6572
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6673
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6885
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7490
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/co.realtime/messaging-android/2.1.56/jars" />
7591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
7692
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
7793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services/6.1.71/jars" />
7894
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
83101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
85102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
87104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
88106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
89108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
90111
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
91112
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
92113
</content>
93114
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
94115
<orderEntry type="sourceFolder" forTests="false" />
95116
<orderEntry type="library" exported="" name="json-simple-1.1" level="project" />
117+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
96118
<orderEntry type="library" exported="" name="messaging-android-2.1.56" level="project" />
119+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
97120
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
98121
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
99122
<orderEntry type="library" exported="" name="play-services-6.1.71" level="project" />

‎build.gradle

Lines changed: 1 addition & 1 deletion
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:1.3.0'
8+
classpath 'com.android.tools.build:gradle:2.1.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Oct 06 16:37:45 WEST 2015
1+
#Thu May 19 18:28:32 WEST 2016
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.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 commit comments

Comments
 (0)