Skip to content

Commit 789161a

Browse files
committed
Use provided for support-fragment in libs and compile in sample apps.
Fixes #2318.
1 parent 1325d87 commit 789161a

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ POM_SCM_DEV_CONNECTION=scm:git@github.com:bumptech/glide.git
1515
POM_DEVELOPER_ID=sjudd
1616
POM_DEVELOPER_NAME=Sam Judd
1717
POM_DEVELOPER_EMAIL=judds@google.com
18-
ANDROID_SUPPORT_VERSION=26.0.1
18+
ANDROID_SUPPORT_VERSION=26.0.2
1919
VOLLEY_VERSION=1.0.0
2020
OK_HTTP_VERSION=3.0.1
2121
ANDROID_GRADLE_VERSION=2.3.0

integration/recyclerview/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
33
dependencies {
44
compile project(':library')
55
provided "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
6+
provided "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
67
}
78

89
android {

library/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
compile project(':third_party:gif_decoder')
2020
compile project(':third_party:disklrucache')
2121
compile project(':annotation')
22-
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
22+
provided "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
2323
provided "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
2424
testCompile project(':testutil')
2525
testCompile 'com.google.guava:guava-testlib:18.0'

samples/gallery/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies {
66
transitive = false
77
}
88
compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
9+
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
910
annotationProcessor project(':annotation:compiler')
1011
}
1112

samples/giphy/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ dependencies {
55
compile(project(':integration:recyclerview')) {
66
transitive = false
77
}
8-
compile 'com.google.code.gson:gson:2.7'
8+
compile 'com.google.code.gson:gson:2.8.0'
99
compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
10+
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
1011
annotationProcessor project(':annotation:compiler')
1112
}
1213

samples/svg/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
compile project(':library')
55
annotationProcessor project(':annotation:compiler')
66
compile 'com.caverock:androidsvg:1.2.1'
7+
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
78
}
89

910
android {

0 commit comments

Comments
 (0)