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

Commit 81f3818

Browse files
committed
Update dependencies and build.
Change-Id: Ib6195ec44cf4ee028209f7ae1d69ca9b6558410c
1 parent 3938ba6 commit 81f3818

File tree

6 files changed

+44
-16
lines changed

6 files changed

+44
-16
lines changed

app/build.gradle

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
apply plugin: 'com.android.application'
1616
apply plugin: 'kotlin-android'
1717
apply plugin: 'kotlin-kapt'
18+
apply plugin: "androidx.navigation.safeargs.kotlin"
1819

1920
android {
2021
compileSdkVersion 29
@@ -38,23 +39,17 @@ android {
3839
}
3940
}
4041

41-
ext {
42-
navigation_version = "2.1.0-alpha05"
43-
}
44-
4542
dependencies {
46-
implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
43+
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
44+
implementation 'androidx.fragment:fragment:1.2.0-alpha01'
4745
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
4846
implementation 'androidx.core:core-ktx:1.0.2'
4947
implementation 'com.google.android.material:material:1.1.0-alpha07'
5048
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5149

52-
implementation "androidx.navigation:navigation-runtime:$navigation_version"
53-
implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
54-
implementation "androidx.navigation:navigation-fragment:$navigation_version"
55-
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
56-
implementation "androidx.navigation:navigation-ui:$navigation_version"
57-
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
50+
implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
51+
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
52+
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
5853
implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
5954

6055
implementation 'com.github.bumptech.glide:glide:4.9.0'

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313
*/
1414

1515
buildscript {
16-
ext.kotlin_version = '1.3.31'
16+
ext.kotlin_version = '1.3.41'
17+
ext.nav_version = '2.1.0-alpha06'
1718
repositories {
1819
google()
1920
jcenter()
2021
}
2122
dependencies {
2223
classpath 'com.android.tools.build:gradle:3.6.0-alpha04'
2324
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
25+
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
2426
}
2527
}
2628

gradle/wrapper/gradle-wrapper.jar

1.26 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Jun 17 21:29:10 BST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

gradlew

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"

gradlew.bat

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
117
@if "%DEBUG%" == "" @echo off
218
@rem ##########################################################################
319
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
1430
set APP_HOME=%DIRNAME%
1531

1632
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
33+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
1834

1935
@rem Find java.exe
2036
if defined JAVA_HOME goto findJavaFromJavaHome

0 commit comments

Comments
 (0)