Skip to content

Commit ed8d861

Browse files
author
Yu-Hsuan Lin
committed
Update sample env.
1 parent 9684283 commit ed8d861

File tree

18 files changed

+118
-121
lines changed

18 files changed

+118
-121
lines changed

‎BasicRxJavaSample/app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ dependencies {
4343
testCompile "org.hamcrest:hamcrest-all:$rootProject.ext.hamcrestVersion"
4444
testCompile "android.arch.core:core-testing:$rootProject.architectureComponentsVersion"
4545

46+
// Resolve conflicts between main and local unit tests
47+
testCompile "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
48+
testCompile "com.android.support:support-core-utils:$rootProject.supportLibraryVersion"
49+
4650
// Android Testing Support Library's runner and rules
4751
androidTestCompile "com.android.support.test:runner:$rootProject.ext.runnerVersion"
4852
androidTestCompile "com.android.support.test:rules:$rootProject.ext.runnerVersion"

‎BasicRxJavaSample/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildscript {
44

55
repositories {
6-
maven { url 'https://maven.google.com' }
6+
google()
77
jcenter()
88
}
99
dependencies {
@@ -29,21 +29,21 @@ task clean(type: Delete) {
2929
ext {
3030
// Sdk and tools
3131
minSdkVersion = 14
32-
targetSdkVersion = 25
33-
compileSdkVersion = 25
34-
buildToolsVersion = '25.0.3'
32+
targetSdkVersion = 26
33+
compileSdkVersion = 26
34+
buildToolsVersion = '26.0.1'
3535

3636
// App dependencies
37-
supportLibraryVersion = '25.3.1'
37+
supportLibraryVersion = '26.0.1'
3838
guavaVersion = '18.0'
3939
junitVersion = '4.12'
4040
mockitoVersion = '1.10.19'
4141
powerMockito = '1.6.2'
4242
hamcrestVersion = '1.3'
43-
runnerVersion = '0.5'
44-
rulesVersion = '0.5'
45-
espressoVersion = '2.2.2'
46-
architectureComponentsVersion = "1.0.0-alpha3"
47-
rxjavaVersion = "2.1.0"
43+
runnerVersion = '1.0.1'
44+
rulesVersion = '1.0.1'
45+
espressoVersion = '3.0.1'
46+
architectureComponentsVersion = "1.0.0-alpha9"
47+
rxjavaVersion = "2.1.3"
4848
rxandroidVersion = "2.0.1"
4949
}

‎BasicRxJavaSample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-4.0-rc-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎BasicRxJavaSampleKotlin/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
defaultConfig {
2727
applicationId "com.example.android.observability"
2828
minSdkVersion 15
29-
targetSdkVersion 25
29+
targetSdkVersion 26
3030
versionCode 1
3131
versionName "1.0"
3232
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

‎BasicRxJavaSampleKotlin/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818

1919
buildscript {
20-
ext.kotlin_version = '1.1.3'
20+
ext.kotlin_version = '1.1.4-2'
2121

2222
repositories {
23-
maven { url 'https://maven.google.com' }
23+
google()
2424
jcenter()
2525
mavenCentral()
2626
}
2727
dependencies {
28-
classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
28+
classpath 'com.android.tools.build:gradle:3.0.0-beta3'
2929
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3030

3131
// NOTE: Do not place your application dependencies here; they belong
@@ -48,19 +48,19 @@ task clean(type: Delete) {
4848
ext {
4949
// Sdk and tools
5050
minSdkVersion = 14
51-
targetSdkVersion = 25
52-
compileSdkVersion = 25
53-
buildToolsVersion = '25.0.3'
51+
targetSdkVersion = 26
52+
compileSdkVersion = 26
53+
buildToolsVersion = '26.0.1'
5454

5555
// App dependencies
56-
supportLibraryVersion = '25.3.1'
56+
supportLibraryVersion = '26.0.1'
5757
junitVersion = '4.12'
5858
mockitoVersion = '1.10.19'
5959
hamcrestVersion = '1.3'
60-
runnerVersion = '0.5'
61-
rulesVersion = '0.5'
62-
espressoVersion = '2.2.2'
63-
architectureComponentsVersion = "1.0.0-alpha7"
64-
rxjavaVersion = "2.1.0"
60+
runnerVersion = '1.0.1'
61+
rulesVersion = '1.0.1'
62+
espressoVersion = '3.0.1'
63+
architectureComponentsVersion = "1.0.0-alpha9"
64+
rxjavaVersion = "2.1.3"
6565
rxandroidVersion = "2.0.1"
6666
}

‎BasicRxJavaSampleKotlin/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-4.1-rc-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

‎BasicSample/app/build.gradle

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
apply plugin: 'com.android.application'
1818

1919
android {
20-
compileSdkVersion 25
20+
compileSdkVersion 26
2121
buildToolsVersion rootProject.buildToolsVersion
2222
defaultConfig {
2323
applicationId 'com.example.android.persistence'
2424
minSdkVersion 21
25-
targetSdkVersion 25
25+
targetSdkVersion 26
2626
versionCode 1
2727
versionName "1.0"
2828
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -48,29 +48,24 @@ android {
4848

4949
dependencies {
5050
compile fileTree(include: ['*.jar'], dir: 'libs')
51-
compile 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion;
52-
compile 'com.android.support:cardview-v7:' + rootProject.supportLibVersion;
53-
compile 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion;
54-
compile 'android.arch.lifecycle:extensions:' + rootProject.archLifecycleVersion;
55-
compile 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion;
56-
annotationProcessor "android.arch.lifecycle:compiler:" + rootProject.archLifecycleVersion;
57-
annotationProcessor "android.arch.persistence.room:compiler:" + rootProject.archRoomVersion;
51+
compile 'com.android.support:design:' + rootProject.supportLibVersion
52+
compile 'com.android.support:cardview-v7:' + rootProject.supportLibVersion
53+
compile 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion
54+
compile 'android.arch.lifecycle:extensions:' + rootProject.archLifecycleVersion
55+
compile 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion
56+
annotationProcessor "android.arch.lifecycle:compiler:" + rootProject.archLifecycleVersion
57+
annotationProcessor "android.arch.persistence.room:compiler:" + rootProject.archRoomVersion
5858

5959
testCompile 'junit:junit:4.12'
6060

6161
// Testing-only dependencies
62-
androidTestCompile 'com.android.support.test:runner:' + rootProject.runnerVersion;
63-
androidTestCompile 'com.android.support.test:rules:' + rootProject.rulesVersion;
64-
androidTestCompile 'com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion;
62+
androidTestCompile 'com.android.support.test:runner:' + rootProject.runnerVersion
63+
androidTestCompile 'com.android.support.test:rules:' + rootProject.rulesVersion
64+
androidTestCompile 'com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion
6565

66-
androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.2'){
67-
exclude group: 'com.android.support', module: 'appcompat-v7'
68-
exclude group: 'com.android.support', module: 'support-v4'
69-
exclude module: 'recyclerview-v7'
70-
}
66+
androidTestCompile 'com.android.support.test.espresso:espresso-contrib:' + rootProject.espressoVersion
7167

7268
// Force usage of dependencies in the test app, since it is internally used by the runner module.
73-
androidTestCompile 'com.android.support:support-annotations:' + rootProject.supportLibVersion;
74-
androidTestCompile 'com.android.support:support-v4:' + rootProject.supportLibVersion;
69+
androidTestCompile 'com.android.support:design:' + rootProject.supportLibVersion;
7570
androidTestCompile 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion;
7671
}

‎BasicSample/app/src/androidTest/java/com/example/android/persistence/MainActivityTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.arch.lifecycle.Observer;
2121
import android.arch.lifecycle.ViewModelProviders;
2222
import android.support.annotation.Nullable;
23-
import android.support.test.espresso.Espresso;
23+
import android.support.test.espresso.IdlingRegistry;
2424
import android.support.test.espresso.IdlingResource;
2525
import android.support.test.espresso.contrib.RecyclerViewActions;
2626
import android.support.test.rule.ActivityTestRule;
@@ -55,7 +55,7 @@ public class MainActivityTest {
5555
@Before
5656
public void idlingResourceSetup() {
5757

58-
Espresso.registerIdlingResources(idlingRes);
58+
IdlingRegistry.getInstance().register(idlingRes);
5959
// There's always
6060
idlingRes.setIdleNow(false);
6161

‎BasicSample/build.gradle

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818

1919
buildscript {
2020
repositories {
21+
google()
2122
jcenter()
2223
}
2324
dependencies {
24-
classpath 'com.android.tools.build:gradle:2.3.1'
25+
classpath 'com.android.tools.build:gradle:2.3.3'
2526

2627
// NOTE: Do not place your application dependencies here; they belong
2728
// in the individual module build.gradle files
@@ -31,9 +32,7 @@ buildscript {
3132
allprojects {
3233
repositories {
3334
jcenter()
34-
maven {
35-
url "https://maven.google.com"
36-
}
35+
google()
3736
}
3837
}
3938

@@ -42,11 +41,11 @@ task clean(type: Delete) {
4241
}
4342

4443
ext {
45-
buildToolsVersion = "25.0.2"
46-
supportLibVersion = "25.3.1"
47-
runnerVersion = "0.5"
48-
rulesVersion = "0.5"
49-
espressoVersion = "2.2.2"
50-
archLifecycleVersion = "1.0.0-alpha1"
51-
archRoomVersion = "1.0.0-alpha1"
44+
buildToolsVersion = "26.0.1"
45+
supportLibVersion = "26.0.1"
46+
runnerVersion = "1.0.1"
47+
rulesVersion = "1.0.1"
48+
espressoVersion = "3.0.1"
49+
archLifecycleVersion = "1.0.0-alpha9"
50+
archRoomVersion = "1.0.0-alpha9"
5251
}

‎BasicSample/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)