Skip to content
This repository was archived by the owner on Sep 13, 2019. It is now read-only.

Commit 9b43ed4

Browse files
author
Doug Sigelbaum
committed
Move fully to androidx/AGP3.2, and add slice-builders-ktx.
1 parent 861b55b commit 9b43ed4

6 files changed

Lines changed: 13 additions & 11 deletions

File tree

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ dependencies {
1212
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0-alpha1"
1313
implementation "androidx.lifecycle:lifecycle-common:2.0.0-alpha1"
1414
implementation "androidx.slice:slice-view:1.0.0-alpha3"
15+
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha3"
1516
implementation "androidx.appcompat:appcompat:1.0.0-alpha3"
1617
implementation "androidx.cardview:cardview:1.0.0-alpha3"
1718
implementation "androidx.core:core-ktx:1.0.0-alpha3"
18-
implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha3"
19-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
19+
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
2020
}
2121

2222
android {
23-
compileSdkVersion "android-P"
23+
compileSdkVersion 28
2424

2525
defaultConfig {
2626
applicationId "com.example.android.sliceviewer"
@@ -34,4 +34,4 @@ android {
3434
sourceCompatibility JavaVersion.VERSION_1_7
3535
targetCompatibility JavaVersion.VERSION_1_7
3636
}
37-
}
37+
}

app/src/main/res/layout/activity_single_slice_viewer.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
16+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
1717
xmlns:app="http://schemas.android.com/apk/res-auto"
1818
xmlns:tools="http://schemas.android.com/tools"
1919
android:layout_width="match_parent"
@@ -74,4 +74,4 @@
7474
</FrameLayout>
7575
</ScrollView>
7676

77-
</android.support.constraint.ConstraintLayout>
77+
</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/slice_row.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
~ See the License for the specific language governing permissions and
1414
~ limitations under the License.
1515
-->
16-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
16+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
1717
xmlns:app="http://schemas.android.com/apk/res-auto"
1818
xmlns:tools="http://schemas.android.com/tools"
1919
android:layout_width="match_parent"
@@ -77,4 +77,4 @@
7777
</FrameLayout>
7878

7979

80-
</android.support.constraint.ConstraintLayout>
80+
</androidx.constraintlayout.widget.ConstraintLayout>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.2'
9+
classpath 'com.android.tools.build:gradle:3.2.0-alpha18'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
android.enableJetifier = true
2+
android.useAndroidX = true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Apr 22 22:43:05 PDT 2018
1+
#Tue Jun 12 10:02:08 PDT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)