Skip to content

Commit 9d9557d

Browse files
JoseAlcerrecaJoseAlcerreca
committed
Bumps build tools, sdk and support lib versions and fixes lint errors
Change-Id: I594e2cc6c35025cdb0451ff89da06ae35b8a8544
1 parent d61bda6 commit 9d9557d

File tree

40 files changed

+93
-168
lines changed

40 files changed

+93
-168
lines changed

Diff for: ‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ A collection of samples demonstrating different frameworks and techniques for au
77
Prerequisites
88
--------------
99

10-
- Android SDK v22
11-
- Android Build Tools v22
12-
- Android Support Repository rev15
10+
- Android SDK v23
11+
- Android Build Tools v23
12+
- Android Support Repository rev17
1313

1414
Getting Started
1515
---------------

Diff for: ‎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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

Diff for: ‎integration/ServiceTestRuleSample/app/build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 23
5+
buildToolsVersion '23.0.0'
66
defaultConfig {
77
applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
88
minSdkVersion 10
9-
targetSdkVersion 22
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -24,6 +24,8 @@ android {
2424

2525
dependencies {
2626
// Testing-only dependencies
27+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
28+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
2729
androidTestCompile 'com.android.support.test:runner:0.3'
2830
androidTestCompile 'com.android.support.test:rules:0.3'
2931
}

Diff for: ‎integration/ServiceTestRuleSample/app/src/main/res/values-w820dp/dimens.xml

-23
This file was deleted.

Diff for: ‎integration/ServiceTestRuleSample/app/src/main/res/values/dimens.xml

-21
This file was deleted.

Diff for: ‎integration/ServiceTestRuleSample/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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

Diff for: ‎runner/AndroidJunitRunnerSample/app/build.gradle

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
apply plugin: 'com.android.application'
22

3+
34
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
5+
compileSdkVersion 23
6+
buildToolsVersion '23.0.0'
67
defaultConfig {
78
applicationId "com.example.android.testing.androidjunitrunnersample"
89
minSdkVersion 8
9-
targetSdkVersion 22
10+
targetSdkVersion 23
1011
versionCode 1
1112
versionName "1.0"
1213

@@ -27,9 +28,12 @@ android {
2728

2829
dependencies {
2930
// App's dependencies, including test
30-
compile 'com.android.support:support-annotations:22.2.0'
31+
compile 'com.android.support:support-annotations:23.0.0'
3132
compile 'com.google.guava:guava:18.0'
33+
3234
// Testing-only dependencies
35+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
36+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
3337
androidTestCompile 'com.android.support.test:runner:0.3'
3438
androidTestCompile 'com.android.support.test:rules:0.3'
3539
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

Diff for: ‎ui/espresso/BasicSample/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 23
5+
buildToolsVersion '23.0.0'
66
defaultConfig {
77
applicationId "com.example.android.testing.espresso.BasicSample"
88
minSdkVersion 10
9-
targetSdkVersion 22
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -24,9 +24,11 @@ android {
2424

2525
dependencies {
2626
// App dependencies
27-
compile 'com.android.support:support-annotations:22.2.0'
27+
compile 'com.android.support:support-annotations:23.0.0'
2828
compile 'com.google.guava:guava:18.0'
2929
// Testing-only dependencies
30+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
31+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
3032
androidTestCompile 'com.android.support.test:runner:0.3'
3133
androidTestCompile 'com.android.support.test:rules:0.3'
3234
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

Diff for: ‎ui/espresso/BasicSample/app/src/main/res/layout/activity_show_text.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
17+
<merge xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:tools="http://schemas.android.com/tools"
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent"
@@ -27,4 +27,4 @@
2727
android:text="@string/hello_world"
2828
android:layout_gravity="center"/>
2929

30-
</FrameLayout>
30+
</merge>

Diff for: ‎ui/espresso/BasicSample/app/src/main/res/values/dimens.xml

-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717
<resources>
1818
<!-- Default screen margins, per the Android Design guidelines. -->
1919
<dimen name="activity_horizontal_margin">16dp</dimen>
20-
<dimen name="activity_vertical_margin">16dp</dimen>
2120
<dimen name="header_margin">32dp</dimen>
2221
</resources>

Diff for: ‎ui/espresso/BasicSample/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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

Diff for: ‎ui/espresso/BasicSampleBundled/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="10"
8-
android:targetSdkVersion="22" />
8+
android:targetSdkVersion="23" />
99

1010
<application
1111
android:icon="@drawable/ic_launcher"

Diff for: ‎ui/espresso/CustomMatcherSample/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 23
5+
buildToolsVersion '23.0.0'
66
defaultConfig {
77
applicationId "com.example.android.testing.espresso.CustomMatcherSample"
88
minSdkVersion 10
9-
targetSdkVersion 22
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -30,9 +30,11 @@ android {
3030

3131
dependencies {
3232
// App dependencies
33-
compile 'com.android.support:support-annotations:22.2.0'
33+
compile 'com.android.support:support-annotations:23.0.0'
3434
compile 'com.google.guava:guava:18.0'
3535
// Testing-only dependencies
36+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
37+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
3638
androidTestCompile 'com.android.support.test:runner:0.3'
3739
androidTestCompile 'com.android.support.test:rules:0.3'
3840
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

Diff for: ‎ui/espresso/CustomMatcherSample/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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

Diff for: ‎ui/espresso/DataAdapterSample/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 23
5+
buildToolsVersion '23.0.0'
66
defaultConfig {
77
applicationId "com.example.android.testing.espresso.DataAdapterSample"
88
minSdkVersion 10
9-
targetSdkVersion 22
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,9 +21,11 @@ android {
2121

2222
dependencies {
2323
// App dependencies
24-
compile 'com.android.support:support-annotations:22.2.0'
24+
compile 'com.android.support:support-annotations:23.0.0'
2525
compile 'com.google.guava:guava:18.0'
2626
// Testing-only dependencies
27+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
28+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
2729
androidTestCompile 'com.android.support.test:runner:0.3'
2830
androidTestCompile 'com.android.support.test:rules:0.3'
2931
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

Diff for: ‎ui/espresso/DataAdapterSample/app/src/main/res/layout/list_item.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<TextView
2727
android:id="@+id/rowContentTextView"
28-
android:layout_width="wrap_content"
28+
android:layout_width="0dp"
2929
android:layout_height="wrap_content"
3030
android:textSize="16sp"
3131
android:layout_weight="1"/>
@@ -34,7 +34,6 @@
3434
android:id="@+id/rowToggleButton"
3535
android:layout_width="wrap_content"
3636
android:layout_height="wrap_content"
37-
android:text=""
38-
/>
37+
android:text=""/>
3938

4039
</LinearLayout>

Diff for: ‎ui/espresso/DataAdapterSample/app/src/main/res/values/dimens.xml

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
-->
1717
<resources>
1818
<!-- Default screen margins, per the Android Design guidelines. -->
19-
<dimen name="activity_horizontal_margin">16dp</dimen>
2019
<dimen name="activity_vertical_margin">16dp</dimen>
2120
<dimen name="list_activity_click_header_height">24dp</dimen>
2221
<dimen name="selection_row_value_margin">12dp</dimen>

Diff for: ‎ui/espresso/DataAdapterSample/app/src/main/res/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@
1717
<resources>
1818
<string name="app_name">Data Adapter Sample</string>
1919
<string name="row_label">Clicked on row</string>
20-
<string name="column_label">Clicked on column</string>
2120
</resources>

Diff for: ‎ui/espresso/DataAdapterSample/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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

Diff for: ‎ui/espresso/IntentsAdvancedSample/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 23
5+
buildToolsVersion '23.0.0'
66
defaultConfig {
77
applicationId "com.example.android.testing.espresso.intents.AdvancedSample"
88
minSdkVersion 10
9-
targetSdkVersion 22
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -24,8 +24,10 @@ android {
2424

2525
dependencies {
2626
// App dependencies
27-
compile 'com.android.support:support-annotations:22.2.0'
27+
compile 'com.android.support:support-annotations:23.0.0'
2828
// Testing-only dependencies
29+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
30+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
2931
androidTestCompile 'com.android.support.test:runner:0.3'
3032
androidTestCompile 'com.android.support.test:rules:0.3'
3133
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

Diff for: ‎ui/espresso/IntentsAdvancedSample/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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

Diff for: ‎ui/espresso/IntentsBasicSample/app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion '22.0.1'
4+
compileSdkVersion 23
5+
buildToolsVersion '23.0.0'
66
defaultConfig {
77
applicationId "com.example.android.testing.espresso.BasicSample"
88
minSdkVersion 10
9-
targetSdkVersion 22
9+
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -24,8 +24,10 @@ android {
2424

2525
dependencies {
2626
// App dependencies
27-
compile 'com.android.support:support-annotations:22.2.0'
27+
compile 'com.android.support:support-annotations:23.0.0'
2828
// Testing-only dependencies
29+
// Force usage of support annotations in the test app, since it is internally used by the runner module.
30+
androidTestCompile 'com.android.support:support-annotations:23.0.0'
2931
androidTestCompile 'com.android.support.test:runner:0.3'
3032
androidTestCompile 'com.android.support.test:rules:0.3'
3133
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

Diff for: ‎ui/espresso/IntentsBasicSample/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.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

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

0 commit comments

Comments
 (0)