Skip to content

Commit

Permalink
Use provided for support-fragment in libs and compile in sample apps.
Browse files Browse the repository at this point in the history
Fixes #2318.
  • Loading branch information
sjudd committed Sep 4, 2017
1 parent 1325d87 commit 789161a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ POM_SCM_DEV_CONNECTION=scm:[email protected]:bumptech/glide.git
POM_DEVELOPER_ID=sjudd
POM_DEVELOPER_NAME=Sam Judd
POM_DEVELOPER_EMAIL[email protected]
ANDROID_SUPPORT_VERSION=26.0.1
ANDROID_SUPPORT_VERSION=26.0.2
VOLLEY_VERSION=1.0.0
OK_HTTP_VERSION=3.0.1
ANDROID_GRADLE_VERSION=2.3.0
Expand Down
1 change: 1 addition & 0 deletions integration/recyclerview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apply plugin: 'com.android.library'
dependencies {
compile project(':library')
provided "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
provided "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
}

android {
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
compile project(':third_party:gif_decoder')
compile project(':third_party:disklrucache')
compile project(':annotation')
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
provided "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
provided "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
testCompile project(':testutil')
testCompile 'com.google.guava:guava-testlib:18.0'
Expand Down
1 change: 1 addition & 0 deletions samples/gallery/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies {
transitive = false
}
compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
annotationProcessor project(':annotation:compiler')
}

Expand Down
3 changes: 2 additions & 1 deletion samples/giphy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ dependencies {
compile(project(':integration:recyclerview')) {
transitive = false
}
compile 'com.google.code.gson:gson:2.7'
compile 'com.google.code.gson:gson:2.8.0'
compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
annotationProcessor project(':annotation:compiler')
}

Expand Down
1 change: 1 addition & 0 deletions samples/svg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dependencies {
compile project(':library')
annotationProcessor project(':annotation:compiler')
compile 'com.caverock:androidsvg:1.2.1'
compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
}

android {
Expand Down

0 comments on commit 789161a

Please sign in to comment.