From c6d5cb34fb286e5599617bf0e783f57f79489b0a Mon Sep 17 00:00:00 2001
From: Jeremy Walker <jewalker@google.com>
Date: Thu, 11 Oct 2018 15:00:25 -0700
Subject: [PATCH] Update library version and clean up XML.

Bug: 117618327
Test: Manually tested.
Change-Id: I395f98932ff0aa5a99af017dd64abfaa9f013078
---
 app/build.gradle                                 | 16 ++++++++--------
 app/src/main/AndroidManifest.xml                 | 12 +++++++-----
 .../res/layout/activity_single_slice_viewer.xml  |  4 ++--
 .../main/res/layout/activity_slice_viewer.xml    |  3 ++-
 app/src/main/res/layout/slice_row.xml            |  3 ++-
 build.gradle                                     |  4 ++--
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d383388e..88f58c07 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,14 +8,14 @@ repositories {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.lifecycle:lifecycle-runtime:2.0.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0-rc01"
-    implementation "androidx.lifecycle:lifecycle-common:2.0.0-rc01"
-    implementation "androidx.slice:slice-view:1.0.0-rc02"
-    implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha5"
-    implementation "androidx.appcompat:appcompat:1.0.0-rc02"
-    implementation "androidx.cardview:cardview:1.0.0-rc02"
-    implementation "androidx.core:core-ktx:1.0.0-rc02"
+    implementation "androidx.lifecycle:lifecycle-runtime:2.0.0"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
+    implementation "androidx.lifecycle:lifecycle-common:2.0.0"
+    implementation "androidx.slice:slice-view:1.0.0"
+    implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha6"
+    implementation "androidx.appcompat:appcompat:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.core:core-ktx:1.0.0"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 01a9358d..469bd654 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,32 +23,35 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
+
         <activity
             android:name=".ui.list.SliceViewerActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
             <intent-filter>
                 <action android:name="androidx.intent.SLICE_ACTION" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".ui.single.SingleSliceViewerActivity"
             android:exported="true"
             android:label="@string/single_slice_viewer_activity"
             android:theme="@style/AppTheme">
+
             <intent-filter>
                 <action android:name="androidx.intent.SLICE_ACTION" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -65,12 +68,11 @@
             android:name=".provider.SampleSliceProvider"
             android:authorities="com.example.android.sliceviewer"
             android:exported="true">
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.app.slice.category.SLICE" />
 
-
                 <data
                     android:host="sliceviewer.android.example.com"
                     android:pathPrefix="/"
diff --git a/app/src/main/res/layout/activity_single_slice_viewer.xml b/app/src/main/res/layout/activity_single_slice_viewer.xml
index b896e352..1a631b19 100644
--- a/app/src/main/res/layout/activity_single_slice_viewer.xml
+++ b/app/src/main/res/layout/activity_single_slice_viewer.xml
@@ -13,7 +13,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -73,5 +74,4 @@
                 android:paddingStart="@dimen/margin_small" />
         </FrameLayout>
     </ScrollView>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_slice_viewer.xml b/app/src/main/res/layout/activity_slice_viewer.xml
index c6227648..68284802 100644
--- a/app/src/main/res/layout/activity_slice_viewer.xml
+++ b/app/src/main/res/layout/activity_slice_viewer.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/slice_row.xml b/app/src/main/res/layout/slice_row.xml
index 92885c8b..67371045 100644
--- a/app/src/main/res/layout/slice_row.xml
+++ b/app/src/main/res/layout/slice_row.xml
@@ -13,7 +13,8 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 0219b2f6..b9c6c704 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.2.71'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-beta02'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }