Skip to content

Commit d211180

Browse files
author
Artem Kholodnyi
committed
Chore: update version
1 parent a8fd121 commit d211180

File tree

5 files changed

+41
-22
lines changed

5 files changed

+41
-22
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
maven { url 'https://maven.fabric.io/public' }
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.0.0-alpha1'
9+
classpath 'com.android.tools.build:gradle:2.0.0-beta5'
1010
classpath 'io.fabric.tools:gradle:1.21.0'
1111

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

‎demo/demo.iml‎

Lines changed: 22 additions & 14 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" />
@@ -51,13 +48,27 @@
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" 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" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5660
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6172
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6273
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6374
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -82,16 +93,11 @@
8293
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.8/jars" />
8394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/fabric" />
8495
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
8896
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
8997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9098
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9199
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
93100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
95101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
96102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
97103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -101,17 +107,19 @@
101107
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
102108
<orderEntry type="sourceFolder" forTests="false" />
103109
<orderEntry type="library" exported="" name="crashlytics-core-2.3.6" level="project" />
104-
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
105110
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
106111
<orderEntry type="library" exported="" name="percent-23.1.1" level="project" />
107-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
108112
<orderEntry type="library" exported="" name="answers-1.3.4" level="project" />
109-
<orderEntry type="library" exported="" name="fabric-1.3.8" level="project" />
110-
<orderEntry type="library" exported="" name="crashlytics-2.5.3" level="project" />
111113
<orderEntry type="library" exported="" name="timber-4.1.0" level="project" />
114+
<orderEntry type="library" exported="" name="crashlytics-2.5.3" level="project" />
112115
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
113-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
114116
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
117+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
118+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
119+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
121+
<orderEntry type="library" exported="" name="fabric-1.3.8" level="project" />
122+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
115123
<orderEntry type="library" exported="" name="beta-1.1.4" level="project" />
116124
<orderEntry type="module" module-name="library" exported="" />
117125
</component>

‎demo/src/main/java/com/yalantis/starwarsdemo/view/SideFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public boolean onMenuItemClick(final MenuItem item) {
7575
@Override
7676
public void onResume() {
7777
super.onResume();
78-
mTilesFrameLayout.onResume();
78+
// mTilesFrameLayout.onResume();
7979
}
8080

8181
@Override

‎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 Nov 23 19:47:53 EET 2015
1+
#Thu Feb 18 12:33:48 EET 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.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

‎library/library.iml‎

Lines changed: 15 additions & 4 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" />
@@ -29,6 +26,7 @@
2926
</component>
3027
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3128
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3230
<exclude-output />
3331
<content url="file://$MODULE_DIR$">
3432
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,13 +48,27 @@
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" 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" />
5358
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5459
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5560
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5661
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5762
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5863
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5964
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6173
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6274
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -74,7 +86,6 @@
7486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
7889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />

0 commit comments

Comments
 (0)