Skip to content

Commit 0792d5f

Browse files
kh0rkh0r
committed
Update build env
1 parent 6178081 commit 0792d5f

File tree

9 files changed

+63
-51
lines changed

9 files changed

+63
-51
lines changed

‎.idea/.name

-1
This file was deleted.

‎.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+1-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

+55-15
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="assembleLocalDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileLocalDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleLocalDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileLocalDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateLocalDebugAndroidTestSources</task>
1916
<task>generateLocalDebugSources</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/local/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/local/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/local/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/local/debug" isTestSource="false" generated="true" />
@@ -45,10 +42,21 @@
4542
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/java" isTestSource="false" />
4643
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/jni" isTestSource="false" />
4744
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/rs" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/localDebug/shaders" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/local/debug" isTestSource="true" generated="true" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/res" type="java-test-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/resources" type="java-test-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/assets" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/aidl" isTestSource="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/java" isTestSource="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/jni" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/rs" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testLocalDebug/shaders" isTestSource="true" />
4855
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/local/debug" isTestSource="true" generated="true" />
4956
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/local/debug" isTestSource="true" generated="true" />
5057
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/local/debug" isTestSource="true" generated="true" />
5158
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/local/debug" isTestSource="true" generated="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/local/debug" isTestSource="true" generated="true" />
5260
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/local/debug" type="java-test-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/local/debug" type="java-test-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/local/res" type="java-resource" />
@@ -58,34 +66,64 @@
5866
<sourceFolder url="file://$MODULE_DIR$/src/local/java" isTestSource="false" />
5967
<sourceFolder url="file://$MODULE_DIR$/src/local/jni" isTestSource="false" />
6068
<sourceFolder url="file://$MODULE_DIR$/src/local/rs" isTestSource="false" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/local/shaders" isTestSource="false" />
6170
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/res" type="java-test-resource" />
6271
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/resources" type="java-test-resource" />
6372
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/assets" type="java-test-resource" />
6473
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/aidl" isTestSource="true" />
6574
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/java" isTestSource="true" />
6675
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/jni" isTestSource="true" />
6776
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/rs" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestLocal/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/testLocal/shaders" isTestSource="true" />
6886
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
6987
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
7088
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
7189
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
7290
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
7391
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
7492
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
93+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
94+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
95+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
96+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
97+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
98+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
99+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
100+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
101+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
75102
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
76103
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
77104
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
78105
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
79106
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
80107
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
81108
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
109+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
82110
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
83111
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
84112
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
85113
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
86114
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
87115
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
88116
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
117+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
118+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
119+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
120+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
121+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
122+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
123+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
124+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
125+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
126+
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
89127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
90128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
91129
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -112,22 +150,24 @@
112150
</content>
113151
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
114152
<orderEntry type="sourceFolder" forTests="false" />
115-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
116-
<orderEntry type="library" exported="" name="schematic-0.6.3" level="project" />
117-
<orderEntry type="library" exported="" name="commons-codec-1.2" level="project" />
118-
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
119153
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
120-
<orderEntry type="library" exported="" name="jcl-over-slf4j-1.7.4" level="project" />
154+
<orderEntry type="library" exported="" name="jackrabbit-webdav-2.10.1" level="project" />
121155
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
156+
<orderEntry type="library" exported="" name="commons-codec-1.2" level="project" />
157+
<orderEntry type="library" exported="" name="android-library-oc-android-library-0.9.8" level="project" />
158+
<orderEntry type="library" exported="" name="schematic-annotations-0.6.3" level="project" />
159+
<orderEntry type="library" exported="" name="core-0.8.1.0" level="project" />
160+
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
122161
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
123-
<orderEntry type="library" exported="" name="jackrabbit-webdav-2.10.1" level="project" />
162+
<orderEntry type="library" exported="" name="jcl-over-slf4j-1.7.4" level="project" />
124163
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
125-
<orderEntry type="library" exported="" name="android-library-oc-android-library-0.9.8" level="project" />
126-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
127-
<orderEntry type="library" exported="" name="slf4j-api-1.7.4" level="project" />
128164
<orderEntry type="library" exported="" name="library-1.1.4" level="project" />
165+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
166+
<orderEntry type="library" exported="" name="schematic-0.6.3" level="project" />
167+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
168+
<orderEntry type="library" exported="" name="slf4j-api-1.7.4" level="project" />
169+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
129170
<orderEntry type="library" exported="" name="commons-httpclient-3.1" level="project" />
130-
<orderEntry type="library" exported="" name="schematic-annotations-0.6.3" level="project" />
131-
<orderEntry type="library" exported="" name="core-0.8.1.0" level="project" />
171+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
132172
</component>
133173
</module>

‎build.gradle

+1-1
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.5.0'
8+
classpath 'com.android.tools.build:gradle:2.2.3'
99
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1010

1111
// NOTE: Do not place your application dependencies here; they belong

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Nov 22 14:08:43 CET 2015
1+
#Sun Dec 11 10:40:04 CET 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.14.1-all.zip

‎myownnotes-android.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

0 commit comments

Comments
 (0)