Move fully to androidx/AGP3.2, and add slice-builders-ktx.

googlearchive · Jun 13, 2018 · 9b43ed4 · 9b43ed4
1 parent 861b55b
commit 9b43ed4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,15 +12,15 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.0.0-alpha1"
     implementation "androidx.lifecycle:lifecycle-common:2.0.0-alpha1"
     implementation "androidx.slice:slice-view:1.0.0-alpha3"
+    implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha3"
     implementation "androidx.appcompat:appcompat:1.0.0-alpha3"
     implementation "androidx.cardview:cardview:1.0.0-alpha3"
     implementation "androidx.core:core-ktx:1.0.0-alpha3"
-    implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha3"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
 }
 
 android {
-    compileSdkVersion "android-P"
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.example.android.sliceviewer"
@@ -34,4 +34,4 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-}
+}
diff --git 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,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<android.support.constraint.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"
@@ -74,4 +74,4 @@
         </FrameLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/slice_row.xml b/app/src/main/res/layout/slice_row.xml
@@ -13,7 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<android.support.constraint.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"
@@ -77,4 +77,4 @@
     </FrameLayout>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha18'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier = true
+android.useAndroidX = true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 22 22:43:05 PDT 2018
+#Tue Jun 12 10:02:08 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip