Skip to content
This repository was archived by the owner on Aug 22, 2024. It is now read-only.

Commit 2cd290b

Browse files
committed
[UPDATE] [#46] Versions upgraded before AndroidX migration.
1 parent 44e8d38 commit 2cd290b

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# Our Android Docker images are currently tagged with the suffix -alpha.
1212
# This is to indicate the images are currently under development and
1313
# might change in backwards incompatible ways from week to week.
14-
- image: circleci/android:api-27-alpha
14+
- image: circleci/android:api-28-alpha
1515
environment:
1616
JVM_OPTS: -Xmx3200m
1717
steps:

.idea/encodings.xml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ android {
4444
dependencies {
4545
implementation fileTree(dir: 'libs', include: ['*.jar'])
4646
// Kotlin support
47-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
47+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
4848

4949
// Android Support libs and Google Android libs
5050
implementation "com.android.support:support-v13:$rootProject.supportLibraryVersion"
@@ -63,7 +63,7 @@ dependencies {
6363
// ========================================================
6464
// 3rd party libraries
6565
// ========================================================
66-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
66+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
6767
debugImplementation "com.squareup.leakcanary:leakcanary-android:$rootProject.leakcanaryLibraryVersion"
6868
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.leakcanaryLibraryVersion"
6969

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

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
android:layout_width="match_parent"
1212
android:layout_height="match_parent"
1313
android:scrollbars="vertical"
14+
tools:listitem="@layout/list_item_layout_preview"
1415
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
1516

1617
</android.support.constraint.ConstraintLayout>

build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ buildscript {
1616
* https://github.com/JetBrains/kotlin/releases
1717
* https://blog.jetbrains.com/kotlin/category/releases/
1818
*/
19-
ext.kotlinVersion = '1.2.31'
19+
ext.kotlinVersion = '1.3.20'
2020

2121
/*
2222
* Android Plugin for Gradle - Version number and release notes
2323
*
2424
* - Stable: https://developer.android.com/studio/releases/gradle-plugin.html
2525
* - Alpha: http://tools.android.com/tech-docs/new-build-system
2626
*/
27-
ext.androidGradleToolsVersion = '3.1.2'
27+
ext.androidGradleToolsVersion = '3.3.2'
2828

2929
/*
3030
* Fabric/Firebase gradle tools version.
3131
* https://firebase.google.com/docs/crashlytics/
3232
*/
33-
ext.fabricGradleToolsVersion = '1.25.1'
33+
ext.fabricGradleToolsVersion = '1.25.4'
3434

3535
/*
3636
* Google play services plugin
3737
* https://firebase.google.com/docs/android/setup
3838
*/
39-
ext.googlePlayServicesToolsVersion = '3.3.1'
39+
ext.googlePlayServicesToolsVersion = '4.0.1'
4040

4141
repositories {
4242
google()
@@ -72,8 +72,8 @@ ext {
7272
// Sdk and tools
7373
// --------------------------------------------------
7474
androidMinSdkVersion = 21 // Lollipop 5.0
75-
androidTargetSdkVersion = 27 // Oreo MR1
76-
androidCompileSdkVersion = 27
75+
androidTargetSdkVersion = 28 // Oreo MR1
76+
androidCompileSdkVersion = 28
7777
// Android SDK Build Tools - Versions: https://developer.android.com/studio/releases/build-tools.html
7878
buildToolsVersion = '27.0.3'
7979

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Apr 29 11:43:26 EDT 2018
1+
#Sun Mar 24 13:26:42 EDT 2019
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.10.1-all.zip

0 commit comments

Comments
 (0)