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

Commit c6c0297

Browse files
committed
BasicLocationKotlin module:
-changed compileSdkVersion and targetSdkVersion to 30 -updated Android Gradle plugin dependency to 4.1.0 -updated Kotlin Gradle plugin and Kotlin JDK dependencies to 1.4.10 -reorganised dependencies -updated Jetpack AppCompat dependency to 1.2.0 -updated Jetpack MaterialComponents dependency to 1.2.1 -replaced Kotlin JDK7 dependency with Kotlin JDK8 -updated PlayServices Location dependency to 17.1.0 -enabled ViewBinding support in module's settings
1 parent a7e1ed4 commit c6c0297

File tree

2 files changed

+41
-9
lines changed

2 files changed

+41
-9
lines changed

BasicLocationKotlin/app/build.gradle

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ apply plugin: 'kotlin-android-extensions'
55
android {
66
compileSdkVersion parent.ext.compileSdkVersion
77

8-
98
defaultConfig {
109
applicationId "com.google.android.gms.location.sample.basiclocationsample"
1110
minSdkVersion parent.ext.minSdkVersion
@@ -19,11 +18,35 @@ android {
1918
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2019
}
2120
}
21+
22+
buildFeatures {
23+
viewBinding true
24+
}
25+
}
26+
27+
ext {
28+
// Android Jetpack
29+
// AppCompat
30+
appCompatVersion = "1.2.0"
31+
// MaterialComponents
32+
materialComponentsVersion = "1.2.1"
33+
34+
// Google PlayServices
35+
// Location
36+
locationVersion = "17.1.0"
2237
}
2338

2439
dependencies {
25-
implementation 'androidx.appcompat:appcompat:1.1.0'
26-
implementation 'com.google.android.material:material:1.0.0'
27-
implementation "com.google.android.gms:play-services-location:17.0.0"
28-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50"
40+
// Android Jetpack
41+
// AppCompat
42+
implementation "androidx.appcompat:appcompat:$appCompatVersion"
43+
// MaterialComponents
44+
implementation "com.google.android.material:material:$materialComponentsVersion"
45+
46+
// Google PlayServices
47+
// Location
48+
implementation "com.google.android.gms:play-services-location:$locationVersion"
49+
50+
// Kotlin
51+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
2952
}

BasicLocationKotlin/build.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
buildscript {
22
ext {
3-
compileSdkVersion = 28
3+
compileSdkVersion = 30
44
minSdkVersion = 16
5-
targetSdkVersion = 28
5+
targetSdkVersion = 30
6+
7+
// Android Gradle plugin
8+
androidGradleVersion = "4.1.0"
9+
10+
// Kotlin Gradle plugin | Kotlin JDK
11+
kotlinVersion = "1.4.10"
612
}
713
repositories {
814
google()
915
jcenter()
1016
}
1117
dependencies {
12-
classpath "com.android.tools.build:gradle:3.5.1"
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
18+
// Android Gradle plugin
19+
classpath "com.android.tools.build:gradle:$androidGradleVersion"
20+
21+
// Kotlin Gradle plugin
22+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1423
}
1524
}
1625

0 commit comments

Comments
 (0)