Skip to content

Commit c8ba335

Browse files
authored
Update library versions. (#414)
Removes buildToolsVersions because an appropriate version is picked
1 parent d6009c3 commit c8ba335

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ buildscript {
2121
minSdkVersion = 14
2222
targetSdkVersion = 27
2323
compileSdkVersion = 27
24-
buildToolsVersion = "27.0.2"
2524
androidGradlePluginVersion = "3.0.1"
2625
androidMavenGradlePluginVersion = "1.5"
2726
gradleBintrayPluginVersion = "1.6"
28-
kotlinVersion = "1.2.0"
29-
supportLibVersion = "27.0.2"
27+
kotlinVersion = "1.2.30"
28+
supportLibVersion = "27.1.0"
3029
espressoVersion = "3.0.0"
3130
testRunnerVersion = "1.0.0"
3231
junitVersion = "4.12"

demo-cat-gallery/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ apply plugin: 'kotlin-android'
1919

2020
android {
2121
compileSdkVersion rootProject.ext.compileSdkVersion
22-
buildToolsVersion rootProject.ext.buildToolsVersion
2322

2423
defaultConfig {
2524
applicationId "com.google.android.flexbox.apps.catgallery"

demo-playground/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ apply plugin: 'kotlin-android'
1919

2020
android {
2121
compileSdkVersion rootProject.ext.compileSdkVersion
22-
buildToolsVersion rootProject.ext.buildToolsVersion
2322

2423
defaultConfig {
2524
applicationId "com.google.android.apps.flexbox"

flexbox/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ apply from: 'bintray.gradle'
2121

2222
android {
2323
compileSdkVersion rootProject.ext.compileSdkVersion
24-
buildToolsVersion rootProject.ext.buildToolsVersion
2524

2625
defaultConfig {
2726
minSdkVersion rootProject.ext.minSdkVersion

flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import com.google.android.flexbox.FlexboxLayoutManager
2525
/**
2626
* [RecyclerView.Adapter] implementation for [TestViewHolder].
2727
*/
28-
internal class TestAdapter private constructor(private val layoutParams: MutableList<FlexboxLayoutManager.LayoutParams>) : RecyclerView.Adapter<TestViewHolder>() {
28+
internal class TestAdapter private constructor(
29+
private val layoutParams: MutableList<FlexboxLayoutManager.LayoutParams>)
30+
: RecyclerView.Adapter<TestViewHolder>() {
2931

3032
private val receivedPayloads = mutableListOf<Any>()
3133

@@ -44,8 +46,8 @@ internal class TestAdapter private constructor(private val layoutParams: Mutable
4446
holder.textView.layoutParams = layoutParams[position]
4547
}
4648

47-
override fun onBindViewHolder(holder: TestViewHolder, position: Int, payloads: List<Any>?) {
48-
payloads?.let(receivedPayloads::addAll)
49+
override fun onBindViewHolder(holder: TestViewHolder, position: Int, payloads: List<Any>) {
50+
receivedPayloads.addAll(payloads)
4951
onBindViewHolder(holder, position)
5052
}
5153

0 commit comments

Comments
 (0)