Skip to content

Commit c3a569f

Browse files
committed
Merge the androidx into master.
Now Android Studio 3.2 and the androidx 1.0.0 versions are stable. Merging the androidx features to the master is ready.
1 parent 771df9f commit c3a569f

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Add the following dependency to your `build.gradle` file:
1010

1111
```
1212
dependencies {
13-
implementation 'com.google.android:flexbox:1.1.0-beta1'
13+
implementation 'com.google.android:flexbox:1.1.0'
1414
}
1515
```
1616

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ buildscript {
2222
targetSdkVersion = 28
2323
compileSdkVersion = 28
2424

25-
androidGradlePluginVersion = "3.2.0-beta04"
25+
androidGradlePluginVersion = "3.2.0"
2626
androidMavenGradlePluginVersion = "1.5"
2727
androidxCoreVersion = "1.0.0"
2828
androidxEspressoVersion = "3.1.0-alpha4"

demo-playground/src/main/res/menu/menu_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ limitations under the License.
1515
-->
1616
<menu xmlns:android="http://schemas.android.com/apk/res/android"
1717
xmlns:tools="http://schemas.android.com/tools"
18+
xmlns:app="http://schemas.android.com/apk/res-auto"
1819
tools:context="com.google.android.flexbox.MainActivity">
1920
<item
2021
android:id="@+id/action_settings"
2122
android:title="@string/action_settings"
2223
android:orderInCategory="100"
23-
android:showAsAction="never" />
24+
app:showAsAction="never" />
2425
</menu>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ package com.google.android.flexbox.test
1818

1919
import android.view.View
2020
import android.widget.TextView
21+
import androidx.recyclerview.widget.RecyclerView
2122

2223
/**
2324
* ViewHolder implementation for a flex item for testing.
2425
*/
25-
internal class TestViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
26+
internal class TestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
2627
val textView: TextView = itemView.findViewById(R.id.textview)
2728
}

flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.ArrayList;
3434
import java.util.List;
3535

36+
import androidx.annotation.NonNull;
3637
import androidx.core.view.ViewCompat;
3738
import androidx.recyclerview.widget.LinearLayoutManager;
3839
import androidx.recyclerview.widget.LinearSmoothScroller;

0 commit comments

Comments
 (0)